diff --git a/patches/openwrt/0005-imagebuilder-add-hostpkgs-to-imagebuilder.patch b/patches/openwrt/0005-imagebuilder-add-hostpkgs-to-imagebuilder.patch index e96a2fae..ee40a7b7 100644 --- a/patches/openwrt/0005-imagebuilder-add-hostpkgs-to-imagebuilder.patch +++ b/patches/openwrt/0005-imagebuilder-add-hostpkgs-to-imagebuilder.patch @@ -14,7 +14,7 @@ After this commit, we are able to use lua in opkg postinstall scripts in combination with the imagebuilder. diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile -index 0580e41c5790d8989ec2daf38e89e046cd1c0862..79bfbbd86fd7ebc4fd888c6b408a2df712c85a81 100644 +index 0580e41c5790d8989ec2daf38e89e046cd1c0862..6a4de542f31ad94bdd7b998f4818c9c228987cfb 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -100,12 +100,22 @@ endif @@ -30,11 +30,11 @@ index 0580e41c5790d8989ec2daf38e89e046cd1c0862..79bfbbd86fd7ebc4fd888c6b408a2df7 STRIP=$(STAGING_DIR_HOST)/bin/sstrip $(SCRIPT_DIR)/rstrip.sh $(PKG_BUILD_DIR)/staging_dir/host/bin/ + # install staging_dir/hostpkg/bin + $(INSTALL_DIR) $(PKG_BUILD_DIR)/staging_dir/hostpkg/bin -+ $(CP) $(STAGING_DIR_HOST)/../hostpkg/bin/* $(PKG_BUILD_DIR)/staging_dir/hostpkg/bin/ ++ $(CP) $(STAGING_DIR_HOSTPKG)/bin/* $(PKG_BUILD_DIR)/staging_dir/hostpkg/bin/ + (cd $(PKG_BUILD_DIR); find staging_dir/hostpkg/bin/ $(IB_LDIR)/scripts/dtc/ -type f | \ + $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(PKG_BUILD_DIR)/staging_dir/hostpkg) + # install lua libs -+ $(CP) $(STAGING_DIR_HOST)/../hostpkg/lib/lua $(PKG_BUILD_DIR)/staging_dir/hostpkg/lib/ ++ $(CP) $(STAGING_DIR_HOSTPKG)/lib/lua $(PKG_BUILD_DIR)/staging_dir/hostpkg/lib/ + STRIP=sstrip $(SCRIPT_DIR)/rstrip.sh $(PKG_BUILD_DIR)/staging_dir/hostpkg/bin/ + # bundle (cd $(BUILD_DIR); \ diff --git a/patches/openwrt/0006-imagebuilder-hacky-way-add-scripts-imagebuilder-into-IB.patch b/patches/openwrt/0006-imagebuilder-hacky-way-add-scripts-imagebuilder-into-IB.patch index 12ef03e3..4ff8be08 100644 --- a/patches/openwrt/0006-imagebuilder-hacky-way-add-scripts-imagebuilder-into-IB.patch +++ b/patches/openwrt/0006-imagebuilder-hacky-way-add-scripts-imagebuilder-into-IB.patch @@ -3,7 +3,7 @@ Date: Sun, 15 Aug 2021 17:06:51 +0200 Subject: imagebuilder: hacky way add scripts/imagebuilder into IB diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile -index 79bfbbd86fd7ebc4fd888c6b408a2df712c85a81..8b89af5c6b490d1ad756fd6c21a8e30a4722a3b6 100644 +index 6a4de542f31ad94bdd7b998f4818c9c228987cfb..a5fa9d9063ee262e247eb9da105c8d32330240ee 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -40,6 +40,11 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean