All of lore.kernel.org
 help / color / mirror / Atom feed
From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 16/20] opkg: move common code & metadata into opkg.inc to reduce code duplication
Date: Mon, 23 Jan 2012 08:21:07 -0800	[thread overview]
Message-ID: <4F1D88F3.7040004@linux.intel.com> (raw)
In-Reply-To: <CAP9ODKrBmJkZs62UxskxwyS3i7LEa_aAv+xEnHvfMUiEW+CO9w@mail.gmail.com>

On 01/20/2012 10:13 PM, Otavio Salvador wrote:
> Seems to have a confusion between: PR_INC and INC_PR.
>
Already fixed in the actual branch, noticed this right after I sent this 
request.

Sau!

> On Sat, Jan 21, 2012 at 03:18, Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>> wrote:
>
>     Signed-off-by: Saul Wold <sgw@linux.intel.com
>     <mailto:sgw@linux.intel.com>>
>     ---
>       meta/recipes-devtools/opkg/opkg.inc      |   43
>     +++++++++++++++++++++++++++-
>       meta/recipes-devtools/opkg/opkg_0.1.8.bb <http://opkg_0.1.8.bb> |
>        44 +----------------------------
>       meta/recipes-devtools/opkg/opkg_svn.bb <http://opkg_svn.bb>   |
>     42 +---------------------------
>       3 files changed, 44 insertions(+), 85 deletions(-)
>
>     diff --git a/meta/recipes-devtools/opkg/opkg.inc
>     b/meta/recipes-devtools/opkg/opkg.inc
>     index 3e350e8..b03eaf7 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
>     <http://opkg_0.1.8.bb> b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
>     <http://opkg_0.1.8.bb>
>     index 18cf042..c206b37 100644
>     --- a/meta/recipes-devtools/opkg/opkg_0.1.8.bb <http://opkg_0.1.8.bb>
>     +++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb <http://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
>     <http://opkg_svn.bb> b/meta/recipes-devtools/opkg/opkg_svn.bb
>     <http://opkg_svn.bb>
>     index f5f540d..c07d393 100644
>     --- a/meta/recipes-devtools/opkg/opkg_svn.bb <http://opkg_svn.bb>
>     +++ b/meta/recipes-devtools/opkg/opkg_svn.bb <http://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
>     <http://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"
>     --
>     1.7.6.5
>
>
>     _______________________________________________
>     Openembedded-core mailing list
>     Openembedded-core@lists.openembedded.org
>     <mailto:Openembedded-core@lists.openembedded.org>
>     http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
>
> --
> Otavio Salvador                             O.S. Systems
> E-mail: otavio@ossystems.com.br <mailto:otavio@ossystems.com.br>
> http://www.ossystems.com.br
> Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core



  reply	other threads:[~2012-01-23 16:28 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-21  5:18 [PATCH 00/20] Refactor -dev packages to move *.a to -staticdev packages Saul Wold
2012-01-21  5:18 ` [PATCH 01/20] Fix Upstream-Status entries Saul Wold
2012-01-21  5:18 ` [PATCH 02/20] apmd: refactor packages for staticdev Saul Wold
2012-01-21  5:18 ` [PATCH 03/20] avahi-ui: " Saul Wold
2012-01-21  5:18 ` [PATCH 04/20] augeas: " Saul Wold
2012-01-21  5:18 ` [PATCH 05/20] libsoup: " Saul Wold
2012-01-21  5:18 ` [PATCH 06/20] sysfsutils: " Saul Wold
2012-01-21  5:18 ` [PATCH 07/20] libxft: " Saul Wold
2012-01-21  5:18 ` [PATCH 08/20] sqlite3: " Saul Wold
2012-01-21  5:18 ` [PATCH 09/20] apr-util: " Saul Wold
2012-01-21  5:18 ` [PATCH 10/20] mpeg2dec: " Saul Wold
2012-01-21  5:18 ` [PATCH 11/20] tiff: " Saul Wold
2012-01-21  5:18 ` [PATCH 12/20] gstreamer: " Saul Wold
2012-01-21  5:18 ` [PATCH 13/20] libtool: " Saul Wold
2012-01-27  8:21   ` Koen Kooi
2012-01-21  5:18 ` [PATCH 14/20] syslinux: " Saul Wold
2012-01-21  5:18 ` [PATCH 15/20] tcp-wrappers: " Saul Wold
2012-01-21  5:18 ` [PATCH 16/20] opkg: move common code & metadata into opkg.inc to reduce code duplication Saul Wold
2012-01-21  6:13   ` Otavio Salvador
2012-01-23 16:21     ` Saul Wold [this message]
2012-01-21  5:18 ` [PATCH 17/20] opkg: refactor packages for staticdev Saul Wold
2012-01-21  5:18 ` [PATCH 18/20] eglibc: " Saul Wold
2012-01-22 20:30   ` Phil Blundell
2012-01-23 16:28     ` Saul Wold
2012-01-21  5:18 ` [PATCH 19/20] binutils: " Saul Wold
2012-01-21  5:18 ` [PATCH 20/20] gcc: " Saul Wold
2012-01-22 20:40   ` Phil Blundell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F1D88F3.7040004@linux.intel.com \
    --to=sgw@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.