From: Felix Fietkau Date: Fri, 22 Jul 2016 10:04:33 +0000 (+0200) Subject: build: remove obsolete variables from opkg command X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37e82e4e42155901756a67ad14f3d5c1335f3b0a;p=openwrt%2Fstaging%2Fadrian.git build: remove obsolete variables from opkg command Signed-off-by: Felix Fietkau --- diff --git a/include/rootfs.mk b/include/rootfs.mk index ac8f04da9c..4b4482c213 100644 --- a/include/rootfs.mk +++ b/include/rootfs.mk @@ -36,10 +36,7 @@ endif # where to build (and put) .ipk packages OPKG:= \ IPKG_NO_SCRIPT=1 \ - IPKG_TMP=$(TMP_DIR)/ipkg \ IPKG_INSTROOT=$(TARGET_DIR) \ - IPKG_CONF_DIR=$(STAGING_DIR)/etc \ - IPKG_OFFLINE_ROOT=$(TARGET_DIR) \ $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \ --offline-root $(TARGET_DIR) \ --force-depends \ diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 4ae0297355..44439854d6 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -56,10 +56,7 @@ PACKAGE_DIR:=$(TOPDIR)/packages LISTS_DIR:=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(TARGET_DIR))))$(DL_DIR) OPKG:= \ IPKG_NO_SCRIPT=1 \ - IPKG_TMP="$(TMP_DIR)/ipkgtmp" \ IPKG_INSTROOT="$(TARGET_DIR)" \ - IPKG_CONF_DIR="$(TMP_DIR)" \ - IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ $(STAGING_DIR_HOST)/bin/opkg \ -f $(TOPDIR)/repositories.conf \ --force-depends \