summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-12-19 17:31:16 +0000
committerPaul Barker <paul@paulbarker.me.uk>2015-02-01 11:06:36 +0000
commit222d229b1ae5fdcaf2ae39ddb4f9680c95c2e860 (patch)
tree220755b5b0ec5d2643f1e2aa8e3b8b14cc6a41ee
parentb219377defc9517af360986352bd7da1a7906f10 (diff)
downloadopenembedded-core-contrib-222d229b1ae5fdcaf2ae39ddb4f9680c95c2e860.tar.gz
openembedded-core-contrib-222d229b1ae5fdcaf2ae39ddb4f9680c95c2e860.tar.bz2
openembedded-core-contrib-222d229b1ae5fdcaf2ae39ddb4f9680c95c2e860.zip
opkg-arch-config: Renamed from opkg-config-base
The name 'opkg-arch-config' is much more descriptive. Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
-rw-r--r--meta/conf/layer.conf2
-rw-r--r--meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb (renamed from meta/recipes-devtools/opkg/opkg-config-base_1.0.bb)5
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc2
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index de96548bd2..4fd3a16cec 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -18,7 +18,7 @@ COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
sysvinit-inittab \
shadow-securetty \
- opkg-config-base \
+ opkg-arch-config \
netbase \
init-ifupdown \
connman-conf \
diff --git a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
index acbe1296bf..4540de2daf 100644
--- a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
+++ b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Base configuration files for opkg"
+SUMMARY = "Architecture-dependent configuration for opkg"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -28,3 +28,6 @@ FILES_${PN} = "${sysconfdir}/opkg/ "
CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf"
+RREPLACES_${PN} = "opkg-config-base"
+RCONFLICTS_${PN} = "opkg-config-base"
+RPROVIDES_${PN} = "opkg-config-base"
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 56c54b6ab7..991c114fd4 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -38,7 +38,7 @@ EXTRA_OECONF = "\
--with-opkglibdir=${OPKGLIBDIR} \
"
-RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base run-postinsts"
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts"
RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN}_class-nativesdk = ""
RREPLACES_${PN} = "opkg-nogpg"