[openwrt/openwrt] e2fsprogs: remove HostBuild

LEDE Commits lede-commits at lists.infradead.org
Fri Jun 28 02:26:01 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/7c32295b0036be425ba0cd527eb06316a87d0ec0

commit 7c32295b0036be425ba0cd527eb06316a87d0ec0
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Wed Jun 26 14:41:28 2024 -0700

    e2fsprogs: remove HostBuild
    
    These things already get built and installed by tools/e2fsprogs. No need
    to duplicate.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/15822
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/utils/e2fsprogs/Makefile | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index 9e2f2fafe5..16b47748e3 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -19,7 +19,7 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=NOTICE
 PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
 
-PKG_BUILD_DEPENDS:=util-linux e2fsprogs/host
+PKG_BUILD_DEPENDS:=util-linux
 PKG_INSTALL:=1
 
 PKG_BUILD_PARALLEL:=1
@@ -225,23 +225,6 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/lib/e2p/e2p.h $(1)/usr/include/e2p
 endef
 
-define Host/Compile
-	$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR)/lib/ss mk_cmds
-	$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR)/lib/et compile_et
-endef
-
-define Host/Install
-	$(INSTALL_DIR) $(1)/share/et
-	$(CP) $(HOST_BUILD_DIR)/lib/et/et_[ch].awk $(1)/share/et/
-	$(INSTALL_DIR) $(1)/share/ss
-	$(CP) $(HOST_BUILD_DIR)/lib/ss/ct_c.{sed,awk} $(1)/share/ss/
-	$(INSTALL_DIR) $(1)/bin
-	$(CP) \
-		$(HOST_BUILD_DIR)/lib/et/compile_et \
-		$(HOST_BUILD_DIR)/lib/ss/mk_cmds \
-		$(1)/bin/
-endef
-
 define Package/e2fsprogs/conffiles
 /etc/e2fsck.conf
 endef
@@ -354,4 +337,3 @@ $(eval $(call BuildPackage,filefrag))
 $(eval $(call BuildPackage,debugfs))
 $(eval $(call BuildPackage,chattr))
 $(eval $(call BuildPackage,lsattr))
-$(eval $(call HostBuild))




More information about the lede-commits mailing list