Browse Source

treewide: remove redundant definitions from package Makefiles

pull/185/head
Matthias Schiffer 4 years ago
parent
commit
31e2000604
No known key found for this signature in database GPG Key ID: 16EF3F64CB201D9C
  1. 11
      admin/autoupdater/Makefile
  2. 9
      admin/pretty-hostname/Makefile
  3. 12
      libs/libpacketmark/Makefile
  4. 11
      libs/libplatforminfo/Makefile
  5. 16
      libs/lua-hash/Makefile
  6. 6
      libs/lua-jsonc/Makefile
  7. 16
      libs/lua-platform-info/Makefile
  8. 3
      libs/lua-simple-uci/Makefile
  9. 2
      net/l3roamd/Makefile
  10. 15
      net/respondd-module-airtime/Makefile
  11. 9
      net/respondd/Makefile
  12. 15
      net/simple-tc/Makefile
  13. 9
      net/sse-multiplex/Makefile
  14. 14
      net/uradvd/Makefile
  15. 1
      utils/libbabelhelper/Makefile
  16. 14
      utils/micrond/Makefile

11
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/

9
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

12
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/

11
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/

16
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/

6
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/

16
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/

3
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

2
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

15
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

9
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/

15
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

9
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

14
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/

1
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

14
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

Loading…
Cancel
Save