diff options
Diffstat (limited to 'target/imagebuilder')
| -rw-r--r-- | target/imagebuilder/Makefile | 2 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 19 | ||||
| -rwxr-xr-x | target/imagebuilder/files/opkg-generate-config.sh | 46 | ||||
| -rw-r--r-- | target/imagebuilder/files/repositories.conf | 5 |
4 files changed, 14 insertions, 58 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 9e9afb2b2..1e3519fba 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -33,7 +33,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean $(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.packageinfo \ $(PKG_BUILD_DIR)/ - $(CP) ./files/opkg-generate-config.sh $(PKG_BUILD_DIR)/scripts/ + $(SED) 's/$$A/$(BOARD)/' $(PKG_BUILD_DIR)/repositories.conf $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages $(CP) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/ $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 0590dfa72..469c4a2dd 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -58,10 +58,15 @@ OPKG:= \ IPKG_CONF_DIR="$(TOPDIR)/tmp" \ IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ $(STAGING_DIR_HOST)/bin/opkg \ - -f $(TOPDIR)/tmp/opkg.conf \ + -f $(TOPDIR)/repositories.conf \ --force-depends \ --force-overwrite \ - --force-run-hooks + --force-postinstall \ + --cache $(TOPDIR)/dl \ + --offline-root $(TARGET_DIR) \ + --add-dest root:/ \ + --add-arch all:100 \ + --add-arch $(ARCH_PACKAGES):200 define Profile $(eval $(call Profile/Default)) @@ -83,11 +88,6 @@ _call_info: FORCE echo 'Available Profiles:' echo; $(PROFILE_LIST) -$(TOPDIR)/tmp/opkg.conf: FORCE - @mkdir -p $(TOPDIR)/tmp - @mkdir -p $(TARGET_DIR)/tmp - @$(TOPDIR)/scripts/opkg-generate-config.sh $(TARGET_DIR) - BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel) # "-pkgname" in the package list means remove "pkgname" from the package list BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES)) @@ -107,9 +107,10 @@ endif $(MAKE) package_postinst $(MAKE) build_image -package_index: $(TOPDIR)/tmp/opkg.conf FORCE +package_index: FORCE @echo @echo Building package index... + @mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ gzip -9c Packages > Packages.gz \ ) >/dev/null 2>/dev/null @@ -145,7 +146,7 @@ build_image: FORCE $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 clean: - rm -rf tmp $(TARGET_DIR) $(BIN_DIR) + rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR) $(BIN_DIR) info: diff --git a/target/imagebuilder/files/opkg-generate-config.sh b/target/imagebuilder/files/opkg-generate-config.sh deleted file mode 100755 index b2047a0d4..000000000 --- a/target/imagebuilder/files/opkg-generate-config.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -TOPDIR="$(pwd)" -TARGETDIR="${1}" - -[ -f "$TOPDIR/scripts/${0##*/}" ] || { - echo "Please execute within the toplevel directory" >&2 - exit 1 -} - -# Try to find package architecture from packages directory -PKGARCH= -for pkg in $TOPDIR/packages/*.ipk; do - if [ -f "$pkg" ]; then - PKGARCH="${pkg##*/}" - PKGARCH="${PKGARCH#*_*_}" - PKGARCH="${PKGARCH%.ipk}" - [ "$PKGARCH" = all ] || break - fi -done - -# Try to find package architecture from the target directory -[ -n "$PKGARCH" ] || { - PKGARCH="${TARGETDIR##*/root-}" - [ "$PKGARCH" != "$TARGETDIR" ] || { - echo "Cannot determine package architecture" >&2 - exit 1 - } -} - -rm -f $TOPDIR/tmp/opkg.conf - -[ -f $TOPDIR/repositories.conf ] && \ - $TOPDIR/staging_dir/host/bin/sed \ - -n -e "s/\$A/$PKGARCH/g" -e "/^[[:space:]]*src/p" \ - $TOPDIR/repositories.conf > $TOPDIR/tmp/opkg.conf - -cat <<EOT >> $TOPDIR/tmp/opkg.conf -dest root / -arch all 100 -arch $PKGARCH 200 -option offline_root $TARGETDIR -src imagebuilder file:$TOPDIR/packages -EOT - -exit 0 diff --git a/target/imagebuilder/files/repositories.conf b/target/imagebuilder/files/repositories.conf index a8bb18345..4a55adb85 100644 --- a/target/imagebuilder/files/repositories.conf +++ b/target/imagebuilder/files/repositories.conf @@ -1,5 +1,6 @@ ## Place your custom repositories here, they must match the architecture and version. -## The special placeholder "$A" can be used to specify the current package architecture. - # src/gz snapshots http://downloads.openwrt.org/snapshots/trunk/$A/packages # src custom file:///usr/src/openwrt/bin/$A/packages + +## This is the local package repository, do not remove! +src imagebuilder file:packages |