From 930424bf2f5593256dcacac6e7cf98699fc2a0db Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 20 Jan 2012 11:05:16 -0800 Subject: opkg: move common code & metadata into opkg.inc to reduce code duplication (From OE-Core rev: da70cc9f33845d62943afc78168e56931d0a9b15) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg/opkg.inc | 43 +++++++++++++++++++++++++++++-- meta/recipes-devtools/opkg/opkg_0.1.8.bb | 44 ++------------------------------ meta/recipes-devtools/opkg/opkg_svn.bb | 42 +----------------------------- 3 files changed, 44 insertions(+), 85 deletions(-) (limited to 'meta/recipes-devtools/opkg') diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 3e350e8197..b03eaf7643 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -11,6 +11,7 @@ DEPENDS_virtclass-native = "curl-native" DEPENDS_virtclass-nativesdk = "curl-nativesdk" PE = "1" +PR_INC = "r6" FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg" @@ -31,8 +32,46 @@ EXTRA_OECONF += "--with-opkglibdir=${localstatedir}/lib" EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" -#PROVIDES_append_virtclass-native = "virtual/update-alternatives-native" -#RPROVIDES_${PN} += "update-alternatives-native" +PROVIDES += "virtual/update-alternatives" +RPROVIDES_update-alternatives-cworth += "update-alternatives" +RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg" +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" +RDEPENDS_${PN}_virtclass-native = "" +RDEPENDS_${PN}_virtclass-nativesdk = "" +PACKAGE_ARCH_update-alternatives-cworth = "all" +RREPLACES_${PN} = "opkg-nogpg" + +PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" + +FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" +FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" +FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" + +# We need to create the lock directory +do_install_append() { + install -d ${D}${localstatedir}/lib/opkg +} + +pkg_postinst_${PN} () { +#!/bin/sh +if [ "x$D" != "x" ]; then + install -d $D${sysconfdir}/rcS.d + # this happens at S98 where our good 'ole packages script used to run + echo "#!/bin/sh +opkg-cl configure +rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure +" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure + chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure +fi + +update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 +} + +pkg_postrm_${PN} () { +#!/bin/sh +update-alternatives --remove opkg ${bindir}/opkg-cl +} + BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/opkg/opkg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg_0.1.8.bb index 18cf0428ce..c206b3782f 100644 --- a/meta/recipes-devtools/opkg/opkg_0.1.8.bb +++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb @@ -1,48 +1,8 @@ require opkg.inc -PROVIDES += "virtual/update-alternatives" -RPROVIDES_update-alternatives-cworth += "update-alternatives" -RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" -RDEPENDS_${PN}_virtclass-native = "" -RDEPENDS_${PN}_virtclass-nativesdk = "" -PACKAGE_ARCH_update-alternatives-cworth = "all" - SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \ file://add_vercmp.patch \ file://headerfix.patch \ -" - -PR = "r4" - -PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" - -FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" -FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" -FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" - -# We need to create the lock directory -do_install_append() { - install -d ${D}${localstatedir}/lib/opkg -} - -pkg_postinst_${PN} () { -#!/bin/sh -if [ "x$D" != "x" ]; then - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d - # this happens at S98 where our good 'ole packages script used to run - echo "#!/bin/sh -opkg-cl configure -rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure -" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure - chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure -fi - -update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 -} - -pkg_postrm_${PN} () { -#!/bin/sh -update-alternatives --remove opkg ${bindir}/opkg-cl -} + " +PR = "${INC_PR}.0" diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb index f5f540d78e..c07d393019 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb @@ -1,14 +1,5 @@ require opkg.inc -PROVIDES += "virtual/update-alternatives" -RPROVIDES_update-alternatives-cworth += "update-alternatives" -RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" -RDEPENDS_${PN}_virtclass-native = "" -RDEPENDS_${PN}_virtclass-nativesdk = "" -PACKAGE_ARCH_update-alternatives-cworth = "all" -RREPLACES_${PN} = "opkg-nogpg" - SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ file://add_vercmp.patch \ file://add_uname_support.patch \ @@ -21,36 +12,5 @@ S = "${WORKDIR}/trunk" SRCREV = "633" PV = "0.1.8+svnr${SRCPV}" -PR = "r5" - -PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" - -FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" -FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" -FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" - -# We need to create the lock directory -do_install_append() { - install -d ${D}${localstatedir}/lib/opkg -} - -pkg_postinst_${PN} () { -#!/bin/sh -if [ "x$D" != "x" ]; then - install -d $D${sysconfdir}/rcS.d - # this happens at S98 where our good 'ole packages script used to run - echo "#!/bin/sh -opkg-cl configure -rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure -" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure - chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure -fi - -update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 -} - -pkg_postrm_${PN} () { -#!/bin/sh -update-alternatives --remove opkg ${bindir}/opkg-cl -} +PR = "${INC_PR}.0" -- cgit v1.2.3-54-g00ecf