From 31e20006049bac3c6d8cf509e47e9d61c184dd71 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 7 Mar 2018 20:51:48 +0100 Subject: [PATCH] treewide: remove redundant definitions from package Makefiles --- admin/autoupdater/Makefile | 11 ----------- admin/pretty-hostname/Makefile | 9 --------- libs/libpacketmark/Makefile | 12 ------------ libs/libplatforminfo/Makefile | 11 +---------- libs/lua-hash/Makefile | 16 ---------------- libs/lua-jsonc/Makefile | 6 ------ libs/lua-platform-info/Makefile | 16 ---------------- libs/lua-simple-uci/Makefile | 3 --- net/l3roamd/Makefile | 2 -- net/respondd-module-airtime/Makefile | 15 --------------- net/respondd/Makefile | 9 --------- net/simple-tc/Makefile | 15 --------------- net/sse-multiplex/Makefile | 9 +-------- net/uradvd/Makefile | 14 -------------- utils/libbabelhelper/Makefile | 1 - utils/micrond/Makefile | 14 -------------- 16 files changed, 2 insertions(+), 161 deletions(-) diff --git a/admin/autoupdater/Makefile b/admin/autoupdater/Makefile index c895a43..7caa3e1 100644 --- a/admin/autoupdater/Makefile +++ b/admin/autoupdater/Makefile @@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autoupdater PKG_VERSION:=4 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -19,15 +17,6 @@ define Package/autoupdater/conffiles /etc/config/autoupdater endef - -CMAKE_OPTIONS += \ - -DCMAKE_BUILD_TYPE:String="MINSIZEREL" - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - define Package/autoupdater/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/usr/sbin/ diff --git a/admin/pretty-hostname/Makefile b/admin/pretty-hostname/Makefile index 4ff7a09..13409a1 100644 --- a/admin/pretty-hostname/Makefile +++ b/admin/pretty-hostname/Makefile @@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pretty-hostname PKG_VERSION:=1 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk define Package/pretty-hostname @@ -14,13 +12,6 @@ define Package/pretty-hostname TITLE:=Manage a pretty hostname in addition to the actual one endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - define Build/Compile endef diff --git a/libs/libpacketmark/Makefile b/libs/libpacketmark/Makefile index 3a16fe6..f25c782 100644 --- a/libs/libpacketmark/Makefile +++ b/libs/libpacketmark/Makefile @@ -12,18 +12,6 @@ define Package/libpacketmark DEPENDS:= endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Configure -endef - -define Build/Compile - CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) -endef - define Package/libpacketmark/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/libpacketmark.so $(1)/usr/lib/ diff --git a/libs/libplatforminfo/Makefile b/libs/libplatforminfo/Makefile index 4c8194a..63a1f85 100644 --- a/libs/libplatforminfo/Makefile +++ b/libs/libplatforminfo/Makefile @@ -1,5 +1,4 @@ include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/target.mk PKG_NAME:=libplatforminfo PKG_VERSION:=2 @@ -9,8 +8,7 @@ PKG_LICENSE:=BSD-2-Clause PKG_FLAGS:=nonshared -PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME) - +include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -21,17 +19,10 @@ define Package/libplatforminfo endef CMAKE_OPTIONS += \ - -DCMAKE_BUILD_TYPE:String="MINSIZEREL" \ -DTARGET:STRING="$(BOARD)" \ -DSUBTARGET:STRING="$(SUBTARGET)" - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - define Package/libplatforminfo/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libplatforminfo.so $(1)/usr/lib/ diff --git a/libs/lua-hash/Makefile b/libs/lua-hash/Makefile index f71c34f..e22700a 100644 --- a/libs/lua-hash/Makefile +++ b/libs/lua-hash/Makefile @@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-hash PKG_VERSION:=1 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk define Package/lua-hash @@ -14,20 +12,6 @@ define Package/lua-hash DEPENDS:=+lua +libubox endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Configure -endef - -define Build/Compile - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS)" \ - $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) -endef - define Package/lua-hash/install $(INSTALL_DIR) $(1)/usr/lib/lua $(CP) $(PKG_BUILD_DIR)/hash.so $(1)/usr/lib/lua/ diff --git a/libs/lua-jsonc/Makefile b/libs/lua-jsonc/Makefile index 8e0d6ca..c89e2ec 100644 --- a/libs/lua-jsonc/Makefile +++ b/libs/lua-jsonc/Makefile @@ -14,12 +14,6 @@ define Package/lua-jsonc DEPENDS:=+liblua +libjson-c endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - define Package/lua-jsonc/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ diff --git a/libs/lua-platform-info/Makefile b/libs/lua-platform-info/Makefile index 42e6675..464e997 100644 --- a/libs/lua-platform-info/Makefile +++ b/libs/lua-platform-info/Makefile @@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-platform-info PKG_VERSION:=1 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk define Package/lua-platform-info @@ -14,20 +12,6 @@ define Package/lua-platform-info DEPENDS:=+lua +libplatforminfo endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Configure -endef - -define Build/Compile - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS)" \ - $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) -endef - define Package/lua-platform-info/install $(INSTALL_DIR) $(1)/usr/lib/lua $(CP) $(PKG_BUILD_DIR)/platform_info.so $(1)/usr/lib/lua/ diff --git a/libs/lua-simple-uci/Makefile b/libs/lua-simple-uci/Makefile index 445c481..fb51e32 100644 --- a/libs/lua-simple-uci/Makefile +++ b/libs/lua-simple-uci/Makefile @@ -14,9 +14,6 @@ define Package/lua-simple-uci DEPENDS:=+libuci-lua endef -define Build/Configure -endef - define Build/Compile endef diff --git a/net/l3roamd/Makefile b/net/l3roamd/Makefile index d1b34af..0fbb41f 100644 --- a/net/l3roamd/Makefile +++ b/net/l3roamd/Makefile @@ -6,8 +6,6 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/freifunk-gluon/l3roamd.git PKG_SOURCE_VERSION:=cc4dcfbe80392d271477716559e9b0956181e7b7 -CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE:STRING=MINSIZEREL - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/net/respondd-module-airtime/Makefile b/net/respondd-module-airtime/Makefile index 1ddda3e..1353eb2 100644 --- a/net/respondd-module-airtime/Makefile +++ b/net/respondd-module-airtime/Makefile @@ -6,7 +6,6 @@ PKG_RELEASE:=1 PKG_LICENSE:=BSD-2-Clause -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DEPENDS := respondd include $(INCLUDE_DIR)/package.mk @@ -18,22 +17,8 @@ define Package/respondd-module-airtime DEPENDS:=+respondd +libnl-tiny endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Configure -endef - - TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny -define Build/Compile - CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) -endef - - define Package/respondd-module-airtime/install $(INSTALL_DIR) $(1)/usr/lib/respondd $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/usr/lib/respondd/airtime.so diff --git a/net/respondd/Makefile b/net/respondd/Makefile index 3971d71..033dda7 100644 --- a/net/respondd/Makefile +++ b/net/respondd/Makefile @@ -5,8 +5,6 @@ PKG_VERSION:=1 PKG_LICENSE:=BSD-2-Clause -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -17,13 +15,6 @@ define Package/respondd TITLE:=Responds to multicast queries with answers generated by Lua code endef -CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE:STRING=MINSIZEREL - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - define Package/respondd/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/respondd $(1)/usr/bin/ diff --git a/net/simple-tc/Makefile b/net/simple-tc/Makefile index 4e82ae4..e3ea0eb 100644 --- a/net/simple-tc/Makefile +++ b/net/simple-tc/Makefile @@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-tc PKG_VERSION:=1 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk define Package/simple-tc @@ -14,21 +12,8 @@ define Package/simple-tc DEPENDS:=+kmod-sched +libnl-tiny endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Configure -endef - - TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny -define Build/Compile - CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) -endef - define Package/simple-tc/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/usr/sbin diff --git a/net/sse-multiplex/Makefile b/net/sse-multiplex/Makefile index 9a33f6a..1b1abc1 100644 --- a/net/sse-multiplex/Makefile +++ b/net/sse-multiplex/Makefile @@ -5,8 +5,6 @@ PKG_VERSION:=2 PKG_LICENSE:=BSD-2-Clause -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -17,12 +15,7 @@ define Package/sse-multiplex TITLE:=Allows multiple clients to receive the same Server-Sent Event stream endef -CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE:STRING=MINSIZEREL -DSSE_MULTIPLEX_SOCKET:STRING=/var/run/sse-multiplex.sock - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef +CMAKE_OPTIONS += -DSSE_MULTIPLEX_SOCKET:STRING=/var/run/sse-multiplex.sock define Package/sse-multiplex/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/net/uradvd/Makefile b/net/uradvd/Makefile index 1a3efa2..af6c384 100644 --- a/net/uradvd/Makefile +++ b/net/uradvd/Makefile @@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uradvd PKG_VERSION:=1 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk define Package/uradvd @@ -14,18 +12,6 @@ define Package/uradvd DEPENDS:=@IPV6 +librt endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Configure -endef - -define Build/Compile - CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) -endef - define Package/uradvd/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/uradvd $(1)/usr/sbin/ diff --git a/utils/libbabelhelper/Makefile b/utils/libbabelhelper/Makefile index 226854d..d8a414c 100644 --- a/utils/libbabelhelper/Makefile +++ b/utils/libbabelhelper/Makefile @@ -12,7 +12,6 @@ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE:String="MINSIZEREL" define Package/libbabelhelper SECTION:=libs diff --git a/utils/micrond/Makefile b/utils/micrond/Makefile index b8dc505..2905917 100644 --- a/utils/micrond/Makefile +++ b/utils/micrond/Makefile @@ -4,8 +4,6 @@ PKG_NAME:=micrond PKG_VERSION:=1 PKG_RELEASE:=1 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk define Package/micrond @@ -15,18 +13,6 @@ define Package/micrond DEPENDS:= endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/Configure -endef - -define Build/Compile - CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) -endef - define Package/micrond/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/usr/sbin