diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-29 12:21:32 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-29 12:21:32 +0000 |
| commit | 9737011e5f5bbe58463e74f1cde43a3b71845215 (patch) | |
| tree | b72113cdf9837a371cd070eab4923c7d99c558ef | |
| parent | eb6d6f3dc1bceda83d2c8f557a415c87c692f99a (diff) | |
| download | openembedded-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>
| -rw-r--r-- | meta-moblin/packages/moblin-feeds/moblin-feed-config-opkg_1.0.bb | 14 | ||||
| -rw-r--r-- | meta/packages/opkg/opkg-config-base_1.0.bb | 28 | ||||
| -rw-r--r-- | meta/packages/opkg/opkg_svn.bb | 4 |
3 files changed, 32 insertions, 14 deletions
diff --git a/meta-moblin/packages/moblin-feeds/moblin-feed-config-opkg_1.0.bb b/meta-moblin/packages/moblin-feeds/moblin-feed-config-opkg_1.0.bb index 559c24c36a..8d4b29c8c3 100644 --- a/meta-moblin/packages/moblin-feeds/moblin-feed-config-opkg_1.0.bb +++ b/meta-moblin/packages/moblin-feeds/moblin-feed-config-opkg_1.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Moblin feed configuration files (Online package repositories)" -PR = "r1" +PR = "r2" PACKAGE_ARCH = "${MACHINE_ARCH}" FEEDNAMEPREFIX ?= "INVALID" @@ -9,15 +9,7 @@ FEEDURIPREFIX ?= "INVALID" 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 basefeedconf=${S}/${sysconfdir}/opkg/base-feeds.conf @@ -36,6 +28,4 @@ do_install () { FILES_${PN} = "${sysconfdir}/opkg/ " -CONFFILES_${PN} += "${sysconfdir}/opkg/base-feeds.conf \ - ${sysconfdir}/opkg/arch.conf" - +CONFFILES_${PN} += "${sysconfdir}/opkg/base-feeds.conf" 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" |