aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-09-08 00:36:35 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-09-08 00:36:35 +0000
commit699876fa6b30be6a3fa11db92bce249d090aeb85 (patch)
treef2b33d2ee119f51b173d4bfc3be71d4fcc116690
parent91118a9500eec1bededcdb8e2f0058368ca7f8b7 (diff)
downloadupstream-699876fa6b30be6a3fa11db92bce249d090aeb85.tar.gz
upstream-699876fa6b30be6a3fa11db92bce249d090aeb85.tar.bz2
upstream-699876fa6b30be6a3fa11db92bce249d090aeb85.zip
- add a helper script to generate opkg.conf, attempt to detect package architecture from packages/ - fix package defaults when no package override is given, IB previously aggregated the defautls of all profiles - introduce a repositories.conf, allows using remote opkg repositories in imagebuilder
SVN-Revision: 22978
-rw-r--r--target/imagebuilder/Makefile5
-rw-r--r--target/imagebuilder/files/Makefile11
-rwxr-xr-xtarget/imagebuilder/files/opkg-generate-config.sh45
-rw-r--r--target/imagebuilder/files/repositories.conf5
4 files changed, 56 insertions, 10 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 42fb7bb69b..9e9afb2b27 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -22,15 +22,18 @@ all: compile
$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
rm -rf $(PKG_BUILD_DIR)
- mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host $(PKG_BUILD_DIR)/target
+ mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host \
+ $(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts
-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
$(CP) \
$(INCLUDE_DIR) $(SCRIPT_DIR) \
$(TOPDIR)/rules.mk \
./files/Makefile \
+ ./files/repositories.conf \
$(TMP_DIR)/.targetinfo \
$(TMP_DIR)/.packageinfo \
$(PKG_BUILD_DIR)/
+ $(CP) ./files/opkg-generate-config.sh $(PKG_BUILD_DIR)/scripts/
$(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 8e6c6d7462..0590dfa72c 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -86,19 +86,12 @@ _call_info: FORCE
$(TOPDIR)/tmp/opkg.conf: FORCE
@mkdir -p $(TOPDIR)/tmp
@mkdir -p $(TARGET_DIR)/tmp
- @echo 'dest root /' > $@
- @echo 'src packages file:$(PACKAGE_DIR)' >> $@
- @echo 'arch all 100' >> $@
-ifneq ($(CONFIG_TARGET_adm5120),y)
- @echo 'arch $(BOARD) 200' >> $@
-else
- @echo 'arch $(BOARD)_$(ARCH) 200' >> $@
-endif
- @echo 'option offline_root $(TARGET_DIR)' >> $@
+ @$(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))
+PACKAGES:=
_call_image:
echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
diff --git a/target/imagebuilder/files/opkg-generate-config.sh b/target/imagebuilder/files/opkg-generate-config.sh
new file mode 100755
index 0000000000..a385d9fa9b
--- /dev/null
+++ b/target/imagebuilder/files/opkg-generate-config.sh
@@ -0,0 +1,45 @@
+#!/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%.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
new file mode 100644
index 0000000000..a8bb183455
--- /dev/null
+++ b/target/imagebuilder/files/repositories.conf
@@ -0,0 +1,5 @@
+## 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