[Buildroot] [git commit branch/next] Revert "package/zip: install to staging"
Peter Korsgaard
peter at korsgaard.com
Mon Feb 20 20:58:50 UTC 2023
commit: https://git.buildroot.net/buildroot/commit/?id=11614fdde1611f846b8e5d99f55af7c6c131b817
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
This reverts commit c5b5b5ccabe35e11f0ca8db4361bb3f335fc59fb.
Commit "c5b5b5ccab package/zip: install to staging" contains a typo that
prevents installing to staging.
ZIP_INSTALLING_STAGING_CMDS -> ZIP_INSTALL_STAGING_CMDS
But the package does not install headers or libraries, only ELF and
manual files.
So instead of fixing the install to staging, revert the bogus commit.
Cc: Jan Pedersen <jp at jp-embedded.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski at gmail.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/zip/zip.mk | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/zip/zip.mk b/package/zip/zip.mk
index 2d11e1c763..67958a4a66 100644
--- a/package/zip/zip.mk
+++ b/package/zip/zip.mk
@@ -11,7 +11,6 @@ ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
ZIP_LICENSE = Info-ZIP
ZIP_LICENSE_FILES = LICENSE
ZIP_CPE_ID_VENDOR = info-zip_project
-ZIP_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_BZIP2),y)
ZIP_DEPENDENCIES += bzip2
@@ -41,11 +40,6 @@ define ZIP_INSTALL_TARGET_CMDS
prefix=$(TARGET_DIR)/usr
endef
-define ZIP_INSTALLING_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
- prefix=$(STAGING_DIR)/usr
-endef
-
define HOST_ZIP_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
More information about the buildroot
mailing list