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 | poky-9737011e5f5bbe58463e74f1cde43a3b71845215.tar.gz |
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 @@ | |||
1 | DESCRIPTION = "Moblin feed configuration files (Online package repositories)" | 1 | DESCRIPTION = "Moblin feed configuration files (Online package repositories)" |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 4 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
5 | 5 | ||
6 | FEEDNAMEPREFIX ?= "INVALID" | 6 | FEEDNAMEPREFIX ?= "INVALID" |
@@ -9,15 +9,7 @@ FEEDURIPREFIX ?= "INVALID" | |||
9 | do_compile() { | 9 | do_compile() { |
10 | mkdir -p ${S}/${sysconfdir}/opkg/ | 10 | mkdir -p ${S}/${sysconfdir}/opkg/ |
11 | 11 | ||
12 | archconf=${S}/${sysconfdir}/opkg/arch.conf | ||
13 | |||
14 | rm -f $archconf | ||
15 | ipkgarchs="${PACKAGE_ARCHS}" | 12 | ipkgarchs="${PACKAGE_ARCHS}" |
16 | priority=1 | ||
17 | for arch in $ipkgarchs; do | ||
18 | echo "arch $arch $priority" >> $archconf | ||
19 | priority=$(expr $priority + 5) | ||
20 | done | ||
21 | 13 | ||
22 | basefeedconf=${S}/${sysconfdir}/opkg/base-feeds.conf | 14 | basefeedconf=${S}/${sysconfdir}/opkg/base-feeds.conf |
23 | 15 | ||
@@ -36,6 +28,4 @@ do_install () { | |||
36 | 28 | ||
37 | FILES_${PN} = "${sysconfdir}/opkg/ " | 29 | FILES_${PN} = "${sysconfdir}/opkg/ " |
38 | 30 | ||
39 | CONFFILES_${PN} += "${sysconfdir}/opkg/base-feeds.conf \ | 31 | CONFFILES_${PN} += "${sysconfdir}/opkg/base-feeds.conf" |
40 | ${sysconfdir}/opkg/arch.conf" | ||
41 | |||
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 @@ | |||
1 | DESCRIPTION = "Base configuration files for opkg" | ||
2 | |||
3 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
4 | |||
5 | do_compile() { | ||
6 | mkdir -p ${S}/${sysconfdir}/opkg/ | ||
7 | |||
8 | archconf=${S}/${sysconfdir}/opkg/arch.conf | ||
9 | |||
10 | rm -f $archconf | ||
11 | ipkgarchs="${PACKAGE_ARCHS}" | ||
12 | priority=1 | ||
13 | for arch in $ipkgarchs; do | ||
14 | echo "arch $arch $priority" >> $archconf | ||
15 | priority=$(expr $priority + 5) | ||
16 | done | ||
17 | } | ||
18 | |||
19 | |||
20 | do_install () { | ||
21 | install -d ${D}${sysconfdir}/opkg | ||
22 | install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/ | ||
23 | } | ||
24 | |||
25 | FILES_${PN} = "${sysconfdir}/opkg/ " | ||
26 | |||
27 | CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf" | ||
28 | |||
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 | |||
3 | PROVIDES += "virtual/update-alternatives" | 3 | PROVIDES += "virtual/update-alternatives" |
4 | RPROVIDES_update-alternatives-cworth += "update-alternatives" | 4 | RPROVIDES_update-alternatives-cworth += "update-alternatives" |
5 | RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg" | 5 | RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg" |
6 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" | 6 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" |
7 | RDEPENDS_${PN}_virtclass-native = "" | 7 | RDEPENDS_${PN}_virtclass-native = "" |
8 | RDEPENDS_${PN}_virtclass-nativesdk = "" | 8 | RDEPENDS_${PN}_virtclass-nativesdk = "" |
9 | PACKAGE_ARCH_update-alternatives-cworth = "all" | 9 | PACKAGE_ARCH_update-alternatives-cworth = "all" |
10 | 10 | ||
11 | PR = "r11" | 11 | PR = "r12" |
12 | 12 | ||
13 | PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" | 13 | PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" |
14 | 14 | ||