summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-01-29 12:21:32 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-01-29 12:21:32 +0000
commit9737011e5f5bbe58463e74f1cde43a3b71845215 (patch)
treeb72113cdf9837a371cd070eab4923c7d99c558ef /meta
parenteb6d6f3dc1bceda83d2c8f557a415c87c692f99a (diff)
downloadopenembedded-core-9737011e5f5bbe58463e74f1cde43a3b71845215.tar.gz
openembedded-core-9737011e5f5bbe58463e74f1cde43a3b71845215.tar.bz2
openembedded-core-9737011e5f5bbe58463e74f1cde43a3b71845215.zip
opkg: We must always include a valid arch.conf file
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/opkg/opkg-config-base_1.0.bb28
-rw-r--r--meta/packages/opkg/opkg_svn.bb4
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/packages/opkg/opkg-config-base_1.0.bb b/meta/packages/opkg/opkg-config-base_1.0.bb
new file mode 100644
index 0000000000..e766f0c7b5
--- /dev/null
+++ b/meta/packages/opkg/opkg-config-base_1.0.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Base configuration files for opkg"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_compile() {
+ mkdir -p ${S}/${sysconfdir}/opkg/
+
+ archconf=${S}/${sysconfdir}/opkg/arch.conf
+
+ rm -f $archconf
+ ipkgarchs="${PACKAGE_ARCHS}"
+ priority=1
+ for arch in $ipkgarchs; do
+ echo "arch $arch $priority" >> $archconf
+ priority=$(expr $priority + 5)
+ done
+}
+
+
+do_install () {
+ install -d ${D}${sysconfdir}/opkg
+ install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+FILES_${PN} = "${sysconfdir}/opkg/ "
+
+CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf"
+
diff --git a/meta/packages/opkg/opkg_svn.bb b/meta/packages/opkg/opkg_svn.bb
index 9df8cf3561..9d8bec8187 100644
--- a/meta/packages/opkg/opkg_svn.bb
+++ b/meta/packages/opkg/opkg_svn.bb
@@ -3,12 +3,12 @@ require opkg.inc
PROVIDES += "virtual/update-alternatives"
RPROVIDES_update-alternatives-cworth += "update-alternatives"
RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
-RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
RDEPENDS_${PN}_virtclass-native = ""
RDEPENDS_${PN}_virtclass-nativesdk = ""
PACKAGE_ARCH_update-alternatives-cworth = "all"
-PR = "r11"
+PR = "r12"
PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth"