summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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}/../")}'
18SIGGEN_EXCLUDERECIPES_ABISAFE += " \ 18SIGGEN_EXCLUDERECIPES_ABISAFE += " \
19 sysvinit-inittab \ 19 sysvinit-inittab \
20 shadow-securetty \ 20 shadow-securetty \
21 opkg-config-base \ 21 opkg-arch-config \
22 netbase \ 22 netbase \
23 init-ifupdown \ 23 init-ifupdown \
24 connman-conf \ 24 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 @@
1SUMMARY = "Base configuration files for opkg" 1SUMMARY = "Architecture-dependent configuration for opkg"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4PACKAGE_ARCH = "${MACHINE_ARCH}" 4PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -28,3 +28,6 @@ FILES_${PN} = "${sysconfdir}/opkg/ "
28 28
29CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf" 29CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf"
30 30
31RREPLACES_${PN} = "opkg-config-base"
32RCONFLICTS_${PN} = "opkg-config-base"
33RPROVIDES_${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 = "\
38 --with-opkglibdir=${OPKGLIBDIR} \ 38 --with-opkglibdir=${OPKGLIBDIR} \
39" 39"
40 40
41RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base run-postinsts" 41RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts"
42RDEPENDS_${PN}_class-native = "" 42RDEPENDS_${PN}_class-native = ""
43RDEPENDS_${PN}_class-nativesdk = "" 43RDEPENDS_${PN}_class-nativesdk = ""
44RREPLACES_${PN} = "opkg-nogpg" 44RREPLACES_${PN} = "opkg-nogpg"