All of lore.kernel.org
 help / color / mirror / Atom feed
From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 20/26] util-linux: Use bitbake default FILES for packaging
Date: Mon, 11 Jul 2011 16:13:27 -0700	[thread overview]
Message-ID: <609c73014776b178c6ac0d011a6e327955d45786.1310425837.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1310425837.git.sgw@linux.intel.com>
In-Reply-To: <cover.1310425837.git.sgw@linux.intel.com>

This will ensure correct -dev and -staticdev packging

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc       |   17 ++++++++++++-----
 meta/recipes-core/util-linux/util-linux_2.19.1.bb |    2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index b77266a..52fa173 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f
                     file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
                     file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
+INC_PR = "r3"
+
 inherit autotools gettext pkgconfig
 DEPENDS = "zlib ncurses"
 DEPENDS_virtclass-native = " lzo-native"
@@ -28,7 +30,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-
 PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
              util-linux-swaponoff util-linux-losetup util-linux-umount \
              util-linux-mount util-linux-readprofile util-linux-libblkid \
-             util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
+             util-linux-libblkid-dev util-linux-libblkid-staticdev \
+             util-linux-libuuid util-linux-libuuid-dev util-linux-libuuid-staticdev \
              util-linux-uuidgen util-linux-lscpu"
 
 EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
@@ -48,10 +51,14 @@ FILES_util-linux-umount = "${base_bindir}/umount.${PN}"
 FILES_util-linux-readprofile = "${base_sbindir}/readprofile"
 FILES_util-linux-uuidgen = "${bindir}/uuidgen"
 
-FILES_util-linux-libblkid = "${libdir}/libblkid.so.*"
-FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid"
-FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
-FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-libblkid = "${libdir}/libblkid${SOLIBS}"
+FILES_util-linux-libblkid-dev = "${libdir}/libblkid${SOLIBSDEV} ${libdir}/libblkid.la ${includedir}/blkid"
+FILES_util-linux-libblkid-staticdev = "${libdir}/libblkid.a"
+RDEPENDS_util-linux-libblkid-staticdev = "util-linux-libblkid-dev (= ${EXTENDPKGV})"
+FILES_util-linux-libuuid = "${libdir}/libuuid${SOLIBS}"
+FILES_util-linux-libuuid-dev = "${libdir}/libuuid${SOLIBSDEV} ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"
+RDEPENDS_util-linux-libuuid-staticdev = "util-linux-libuuid-dev (= ${EXTENDPKGV})"
 FILES_util-linux-lscpu = "${bindir}/lscpu"
 
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 0fd67d1..3c5747c 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r2"
+PR = "${INC_PR}.0"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
-- 
1.7.3.4




  parent reply	other threads:[~2011-07-11 23:17 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-11 23:13 [PATCH 00/26] Staticdev re-packaging - split version Saul Wold
2011-07-11 23:13 ` [PATCH 01/26] bitbake.conf: Add *-config to default ${PN}-dev package Saul Wold
2011-07-12  9:05   ` Phil Blundell
2011-07-11 23:13 ` [PATCH 02/26] lib_package.bbclass: add *_nonshared.a to -dev package Saul Wold
2011-07-12  9:59   ` Phil Blundell
2011-07-11 23:13 ` [PATCH 03/26] shared_lib.bbclass: create common class Saul Wold
2011-07-12  6:57   ` Koen Kooi
2011-07-12  9:11   ` Phil Blundell
2011-07-12  9:13     ` Phil Blundell
2011-07-12 18:26       ` Saul Wold
2011-07-11 23:13 ` [PATCH 04/26] pciutils: repackage development files in pciutils instead of libpci Saul Wold
2011-07-11 23:13 ` [PATCH 05/26] wireless-tools: Updated for staticdev packaging Saul Wold
2011-07-12  7:02   ` Koen Kooi
2011-07-11 23:13 ` [PATCH 06/26] augeas: inherit shared_lib class Saul Wold
2011-07-11 23:13 ` [PATCH 07/26] gamin: " Saul Wold
2011-07-11 23:13 ` [PATCH 08/26] sqlite3: " Saul Wold
2011-07-12  7:00   ` Koen Kooi
2011-07-12 18:41     ` Saul Wold
2011-07-12 18:48       ` Phil Blundell
2011-07-12 19:24         ` Saul Wold
2011-07-11 23:13 ` [PATCH 09/26] curl: " Saul Wold
2011-07-11 23:13 ` [PATCH 10/26] attr: " Saul Wold
2011-07-11 23:13 ` [PATCH 11/26] rpm: Create ${PN}-staticdev package Saul Wold
2011-07-12  7:11   ` Koen Kooi
2011-07-11 23:13 ` [PATCH 12/26] libxft: use default bitbake.conf FILES Packaging to handle staticdev Saul Wold
2011-07-12  7:10   ` Koen Kooi
2011-07-11 23:13 ` [PATCH 13/26] js: Use bitbake default FILES for packaging Saul Wold
2011-07-12  7:13   ` Koen Kooi
2011-07-12 18:48     ` Saul Wold
2011-07-11 23:13 ` [PATCH 14/26] tcp-wrappers: " Saul Wold
2011-07-12  7:16   ` Koen Kooi
2011-07-12 19:10     ` Saul Wold
2011-07-11 23:13 ` [PATCH 15/26] udev: " Saul Wold
2011-07-11 23:13 ` [PATCH 16/26] liba52: " Saul Wold
2011-07-11 23:13 ` [PATCH 17/26] python: " Saul Wold
2011-07-12  7:08   ` Koen Kooi
2011-07-11 23:13 ` [PATCH 18/26] external-csl-toolchain: " Saul Wold
2011-07-11 23:13 ` [PATCH 19/26] opkg: " Saul Wold
2011-07-11 23:13 ` Saul Wold [this message]
2011-07-11 23:13 ` [PATCH 21/26] gettext: " Saul Wold
2011-07-12  7:17   ` Koen Kooi
2011-07-11 23:13 ` [PATCH 22/26] gcc: " Saul Wold
2011-07-11 23:13 ` [PATCH 23/26] glibc: " Saul Wold
2011-07-12  7:16   ` Koen Kooi
2011-07-11 23:13 ` [PATCH 24/26] eglibc: " Saul Wold
2011-07-11 23:13 ` [PATCH 25/26] uclibc: " Saul Wold
2011-07-11 23:13 ` [PATCH 26/26] binutils: " Saul Wold

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=609c73014776b178c6ac0d011a6e327955d45786.1310425837.git.sgw@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.