projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
image: fix CONFIG_CLEAN_IPKG with CONFIG_TARGET_PER_DEVICE_ROOTFS
[openwrt/openwrt.git]
/
include
/
rootfs.mk
diff --git
a/include/rootfs.mk
b/include/rootfs.mk
index ac8f04da9cfa2500dff7f712c5f1acf3a3669638..6a6610019f6a4fb6c07c9c45feea338e202df1fa 100644
(file)
--- a/
include/rootfs.mk
+++ b/
include/rootfs.mk
@@
-34,14
+34,12
@@
ifdef CONFIG_USE_MKLIBS
endif
# where to build (and put) .ipk packages
endif
# 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_CONF_DIR=$(STAGING_DIR)/etc \
- IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
- $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
- --offline-root $(TARGET_DIR) \
+ IPKG_INSTROOT=$(1) \
+ TMPDIR=$(1)/tmp \
+ $(STAGING_DIR_HOST)/bin/opkg \
+ --offline-root $(1) \
--force-depends \
--force-overwrite \
--force-postinstall \
--force-depends \
--force-overwrite \
--force-postinstall \
@@
-50,6
+48,11
@@
OPKG:= \
--add-arch all:100 \
--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
--add-arch all:100 \
--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
+opkg_package_files = $(wildcard \
+ $(foreach dir,$(PACKAGE_SUBDIRS), \
+ $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
+
+TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD)
define prepare_rootfs
@if [ -d $(TOPDIR)/files ]; then \
define prepare_rootfs
@if [ -d $(TOPDIR)/files ]; then \
@@
-71,6
+74,7
@@
define prepare_rootfs
@-find $(1) -name .svn | $(XARGS) rm -rf
@-find $(1) -name .git | $(XARGS) rm -rf
@-find $(1) -name '.#*' | $(XARGS) rm -f
@-find $(1) -name .svn | $(XARGS) rm -rf
@-find $(1) -name .git | $(XARGS) rm -rf
@-find $(1) -name '.#*' | $(XARGS) rm -f
+ rm -f $(1)/usr/lib/opkg/lists/*
rm -f $(1)/usr/lib/opkg/info/*.postinst*
rm -f $(1)/usr/lib/opkg/info/*.prerm*
$(if $(CONFIG_CLEAN_IPKG),rm -rf $(1)/usr/lib/opkg)
rm -f $(1)/usr/lib/opkg/info/*.postinst*
rm -f $(1)/usr/lib/opkg/info/*.prerm*
$(if $(CONFIG_CLEAN_IPKG),rm -rf $(1)/usr/lib/opkg)