summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-12-19 17:50:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:53:56 +0000
commite4d165d79a64786e58129f8c3372b8697cf83c36 (patch)
treeded9a92df76b817a98bbc1db6bbf805f3de09a0e
parent3d18626bf0bad0ef41629a38ba2b788fdf255a18 (diff)
downloadpoky-e4d165d79a64786e58129f8c3372b8697cf83c36.tar.gz
opkg: Merge in opkg-collateral
All non-arch-specific and non-distro-specific configuration is now kept in the main 'opkg' recipe and package. (From OE-Core rev: e8879cd1ec8914815c7a78f1d9b296b0e2b30fcf) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
-rw-r--r--meta/recipes-devtools/opkg/opkg-collateral.bb21
-rw-r--r--meta/recipes-devtools/opkg/opkg/opkg.conf (renamed from meta/recipes-devtools/opkg/opkg-collateral/opkg.conf)0
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.2.4.bb14
4 files changed, 14 insertions, 23 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 6139cc7d59..dd144e49ef 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -6,7 +6,7 @@
6# 6#
7 7
8EXTRAOPKGCONFIG ?= "" 8EXTRAOPKGCONFIG ?= ""
9ROOTFS_PKGMANAGE = "opkg opkg-collateral ${EXTRAOPKGCONFIG}" 9ROOTFS_PKGMANAGE = "opkg ${EXTRAOPKGCONFIG}"
10ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 10ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
11 11
12do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" 12do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb
deleted file mode 100644
index f080dfc3ab..0000000000
--- a/meta/recipes-devtools/opkg/opkg-collateral.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1SUMMARY = "Constructs the main configuration file for opkg"
2SECTION = "base"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r2"
6
7SRC_URI = "file://opkg.conf"
8
9S = "${WORKDIR}"
10
11OPKGLIBDIR = "${localstatedir}/lib"
12do_compile () {
13 echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
14}
15
16do_install () {
17 install -d ${D}${sysconfdir}/opkg
18 install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
19}
20
21CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"
diff --git a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf b/meta/recipes-devtools/opkg/opkg/opkg.conf
index c2e9e92f95..c2e9e92f95 100644
--- a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf
+++ b/meta/recipes-devtools/opkg/opkg/opkg.conf
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
index be8394a361..5aaabcf08b 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
@@ -15,6 +15,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
15 file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \ 15 file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \
16 file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \ 16 file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \
17 file://opkg-configure.service \ 17 file://opkg-configure.service \
18 file://opkg.conf \
18" 19"
19 20
20S = "${WORKDIR}/${BPN}-${PV}" 21S = "${WORKDIR}/${BPN}-${PV}"
@@ -51,7 +52,14 @@ do_configure_prepend() {
51 sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am 52 sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
52} 53}
53 54
55do_compile_append () {
56 echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
57}
58
54do_install_append () { 59do_install_append () {
60 install -d ${D}${sysconfdir}/opkg
61 install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
62
55 # We need to create the lock directory 63 # We need to create the lock directory
56 install -d ${D}${OPKGLIBDIR}/opkg 64 install -d ${D}${OPKGLIBDIR}/opkg
57 65
@@ -75,7 +83,9 @@ do_install_append () {
75RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts" 83RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts"
76RDEPENDS_${PN}_class-native = "" 84RDEPENDS_${PN}_class-native = ""
77RDEPENDS_${PN}_class-nativesdk = "" 85RDEPENDS_${PN}_class-nativesdk = ""
78RREPLACES_${PN} = "opkg-nogpg" 86RREPLACES_${PN} = "opkg-nogpg opkg-collateral"
87RCONFLICTS_${PN} = "opkg-collateral"
88RPROVIDES_${PN} = "opkg-collateral"
79 89
80PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg" 90PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg"
81 91
@@ -85,3 +95,5 @@ FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
85FILES_${PN} += "${systemd_unitdir}/system/" 95FILES_${PN} += "${systemd_unitdir}/system/"
86 96
87BBCLASSEXTEND = "native nativesdk" 97BBCLASSEXTEND = "native nativesdk"
98
99CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"