ubox: move logd into ubox package
Preparation for further build rework Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
798cd261ab
commit
223c124db8
2 changed files with 2 additions and 14 deletions
|
@ -13,7 +13,7 @@ __target_inc=1
|
||||||
DEVICE_TYPE?=router
|
DEVICE_TYPE?=router
|
||||||
|
|
||||||
# Default packages - the really basic set
|
# Default packages - the really basic set
|
||||||
DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd
|
DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch
|
||||||
# For nas targets
|
# For nas targets
|
||||||
DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm
|
DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm
|
||||||
# For router targets
|
# For router targets
|
||||||
|
|
|
@ -28,15 +28,8 @@ define Package/ubox
|
||||||
TITLE:=OpenWrt system helper toolbox
|
TITLE:=OpenWrt system helper toolbox
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/logd
|
|
||||||
SECTION:=base
|
|
||||||
CATEGORY:=Base system
|
|
||||||
DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt
|
|
||||||
TITLE:=OpenWrt system log implementation
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/ubox/install
|
define Package/ubox/install
|
||||||
$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/ $(1)/usr/bin
|
$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin $(1)/etc/init.d
|
||||||
|
|
||||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
|
||||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/
|
||||||
|
@ -47,14 +40,9 @@ define Package/ubox/install
|
||||||
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/lsmod
|
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/lsmod
|
||||||
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/modinfo
|
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/modinfo
|
||||||
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/modprobe
|
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/modprobe
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/logd/install
|
|
||||||
$(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/
|
|
||||||
|
|
||||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
|
||||||
$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
|
$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,ubox))
|
$(eval $(call BuildPackage,ubox))
|
||||||
$(eval $(call BuildPackage,logd))
|
|
||||||
|
|
Loading…
Reference in a new issue