浏览代码

build: remove obsolete variables from opkg command

Signed-off-by: Felix Fietkau <[email protected]>
Felix Fietkau 9 年之前
父节点
当前提交
37e82e4e42
共有 2 个文件被更改,包括 0 次插入6 次删除
  1. 0 3
      include/rootfs.mk
  2. 0 3
      target/imagebuilder/files/Makefile

+ 0 - 3
include/rootfs.mk

@@ -36,10 +36,7 @@ endif
 # where to build (and put) .ipk packages
 # where to build (and put) .ipk packages
 OPKG:= \
 OPKG:= \
   IPKG_NO_SCRIPT=1 \
   IPKG_NO_SCRIPT=1 \
-  IPKG_TMP=$(TMP_DIR)/ipkg \
   IPKG_INSTROOT=$(TARGET_DIR) \
   IPKG_INSTROOT=$(TARGET_DIR) \
-  IPKG_CONF_DIR=$(STAGING_DIR)/etc \
-  IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
   $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
   $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
 	--offline-root $(TARGET_DIR) \
 	--offline-root $(TARGET_DIR) \
 	--force-depends \
 	--force-depends \

+ 0 - 3
target/imagebuilder/files/Makefile

@@ -56,10 +56,7 @@ PACKAGE_DIR:=$(TOPDIR)/packages
 LISTS_DIR:=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(TARGET_DIR))))$(DL_DIR)
 LISTS_DIR:=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(TARGET_DIR))))$(DL_DIR)
 OPKG:= \
 OPKG:= \
   IPKG_NO_SCRIPT=1 \
   IPKG_NO_SCRIPT=1 \
-  IPKG_TMP="$(TMP_DIR)/ipkgtmp" \
   IPKG_INSTROOT="$(TARGET_DIR)" \
   IPKG_INSTROOT="$(TARGET_DIR)" \
-  IPKG_CONF_DIR="$(TMP_DIR)" \
-  IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \
   $(STAGING_DIR_HOST)/bin/opkg \
   $(STAGING_DIR_HOST)/bin/opkg \
 	-f $(TOPDIR)/repositories.conf \
 	-f $(TOPDIR)/repositories.conf \
 	--force-depends \
 	--force-depends \