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>
This commit is contained in:
parent
3d18626bf0
commit
e4d165d79a
|
@ -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"
|
||||
|
|
|
@ -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"
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue