diff options
| author | Rosen Penev | 2024-06-30 16:08:40 +0000 |
|---|---|---|
| committer | Robert Marko | 2024-06-30 17:05:21 +0000 |
| commit | 55bda9863dd067221a2bf3645f513c7d8debb89d (patch) | |
| tree | 53a389b870b79385eaf1e8fe7f8aaad1cd5f093b | |
| parent | b4069fad025abb26e17988b769a6589b6c504dfb (diff) | |
| download | openwrt-55bda9863dd067221a2bf3645f513c7d8debb89d.tar.gz | |
tools/e2fsprogs: fix shell scripts under SDK
7c32295b0036be425ba0cd527eb06316a87d0ec0 exposed a problem where the SDK
builds these shell scripts with a nonsensical absolute path for the DIR
variable. Use sed to patch in $STAGING_DIR_HOST.
Also remove PKG_RELEASE as that is nonsensical for tools.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/15841
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | tools/e2fsprogs/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index 1025b7ec5e..cb59f4d9ec 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -11,7 +11,6 @@ PKG_NAME:=e2fsprogs PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs PKG_VERSION:=1.47.0 PKG_HASH:=0b4fe723d779b0927fb83c9ae709bc7b40f66d7df36433bef143e41c54257084 -PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/ @@ -38,6 +37,12 @@ define Host/Prepare rm -rf $(HOST_BUILD_DIR)/doc endef +define Host/Install + $(call Host/Install/Default) + $(SED) 's|^DIR=.*|DIR=$$$$(STAGING_DIR_HOST)/share/et|' $(STAGING_DIR_HOST)/bin/compile_et + $(SED) 's|^DIR=.*|DIR=$$$$(STAGING_DIR_HOST)/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds +endef + define Host/Uninstall -$(call Host/Compile/Default,uninstall) endef |