From 714542d4c6722213e2c9c161063b84c629d3ec25 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Fri, 19 Dec 2014 17:50:12 +0000 Subject: opkg: Merge in opkg-collateral All non-arch-specific and non-distro-specific configuration is now kept in the main 'opkg' recipe and package. Signed-off-by: Paul Barker --- meta/classes/rootfs_ipk.bbclass | 2 +- meta/recipes-devtools/opkg/opkg-collateral.bb | 21 ---------------- .../opkg/opkg-collateral/opkg.conf | 28 ---------------------- meta/recipes-devtools/opkg/opkg/opkg.conf | 28 ++++++++++++++++++++++ meta/recipes-devtools/opkg/opkg_0.2.4.bb | 14 ++++++++++- 5 files changed, 42 insertions(+), 51 deletions(-) delete mode 100644 meta/recipes-devtools/opkg/opkg-collateral.bb delete mode 100644 meta/recipes-devtools/opkg/opkg-collateral/opkg.conf create mode 100644 meta/recipes-devtools/opkg/opkg/opkg.conf 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 @@ # EXTRAOPKGCONFIG ?= "" -ROOTFS_PKGMANAGE = "opkg opkg-collateral ${EXTRAOPKGCONFIG}" +ROOTFS_PKGMANAGE = "opkg ${EXTRAOPKGCONFIG}" ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" do_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 @@ -SUMMARY = "Constructs the main configuration file for opkg" -SECTION = "base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r2" - -SRC_URI = "file://opkg.conf" - -S = "${WORKDIR}" - -OPKGLIBDIR = "${localstatedir}/lib" -do_compile () { - echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf -} - -do_install () { - install -d ${D}${sysconfdir}/opkg - install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf -} - -CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" diff --git a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf deleted file mode 100644 index c2e9e92f95..0000000000 --- a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf +++ /dev/null @@ -1,28 +0,0 @@ -# Must have one or more source entries of the form: -# -# src -# -# and one or more destination entries of the form: -# -# dest -# -# where and are identifiers that -# should match [a-zA-Z0-9._-]+, should be a -# URL that points to a directory containing a Familiar -# Packages file, and should be a directory -# that exists on the target system. - -# Proxy Support -#option http_proxy http://proxy.tld:3128 -#option ftp_proxy http://proxy.tld:3128 -#option proxy_username -#option proxy_password - -# Enable GPGME signature -# option check_signature 1 - -# Offline mode (for use in constructing flash images offline) -#option offline_root target - -# Default destination for installed packages -dest root / diff --git a/meta/recipes-devtools/opkg/opkg/opkg.conf b/meta/recipes-devtools/opkg/opkg/opkg.conf new file mode 100644 index 0000000000..c2e9e92f95 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/opkg.conf @@ -0,0 +1,28 @@ +# Must have one or more source entries of the form: +# +# src +# +# and one or more destination entries of the form: +# +# dest +# +# where and are identifiers that +# should match [a-zA-Z0-9._-]+, should be a +# URL that points to a directory containing a Familiar +# Packages file, and should be a directory +# that exists on the target system. + +# Proxy Support +#option http_proxy http://proxy.tld:3128 +#option ftp_proxy http://proxy.tld:3128 +#option proxy_username +#option proxy_password + +# Enable GPGME signature +# option check_signature 1 + +# Offline mode (for use in constructing flash images offline) +#option offline_root target + +# Default destination for installed packages +dest root / 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 file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \ file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \ file://opkg-configure.service \ + file://opkg.conf \ " S = "${WORKDIR}/${BPN}-${PV}" @@ -51,7 +52,14 @@ do_configure_prepend() { sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am } +do_compile_append () { + echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf +} + do_install_append () { + install -d ${D}${sysconfdir}/opkg + install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf + # We need to create the lock directory install -d ${D}${OPKGLIBDIR}/opkg @@ -75,7 +83,9 @@ do_install_append () { RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RREPLACES_${PN} = "opkg-nogpg" +RREPLACES_${PN} = "opkg-nogpg opkg-collateral" +RCONFLICTS_${PN} = "opkg-collateral" +RPROVIDES_${PN} = "opkg-collateral" PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg" @@ -85,3 +95,5 @@ FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" FILES_${PN} += "${systemd_unitdir}/system/" BBCLASSEXTEND = "native nativesdk" + +CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" -- cgit 1.2.3-korg