[PATCH 0/5] improvements for util-linux, v2

[PATCH 0/5] improvements for util-linux, v2

[Qing He]

change from v1:
 - merges the change introduced by Paul Eggleton
 - fix lscpu packaging (which is under GPLv3)

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: qhe/fix
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
    Qing He
---


Paul Eggleton (2):
  gst-plugins-base: add util-linux to DEPENDS
  nfs-utils, e2fsprogs, mtd-utils, libsm: bump PR

Qing He (3):
  util-linux: separately packaging blkid and uuid
  util-linux: fix dangling symlinks
  util-linux: fix lscpu packaging

 .../nfs-utils/nfs-utils_1.2.3.bb                   |    2 +-
 meta/recipes-core/util-linux/util-linux.inc        |   30 ++++++++++++++++----
 meta/recipes-core/util-linux/util-linux_2.17.2.bb  |    2 +-
 .../e2fsprogs/e2fsprogs_1.41.12.bb                 |    2 +-
 meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb       |    2 +-
 meta/recipes-graphics/xorg-lib/libsm_1.2.0.bb      |    2 +-
 .../gstreamer/gst-plugins-base_0.10.31.bb          |    4 +-
 7 files changed, 31 insertions(+), 13 deletions(-)

[PATCH 3/5] util-linux: fix lscpu packaging

[Qing He]

lscpu in util-linux 2.17.2 is specially under GPLv3, ensure it's
packaged separately if it's being built.

Signed-off-by: Qing He <qing.he@intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc       |    5 ++++-
 meta/recipes-core/util-linux/util-linux_2.17.2.bb |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 6830392..7dc0cc5 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,7 +29,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/u
 
 PACKAGES_prepend = "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 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
+                    util-linux-lscpu \
+                   "
 
 PACKAGES_virtclass-native = ""
 
@@ -49,6 +51,7 @@ FILES_util-linux-losetup = "/sbin/losetup.${PN}"
 FILES_util-linux-mount = "/bin/mount.${PN}"
 FILES_util-linux-umount = "/bin/umount.${PN}"
 FILES_util-linux-readprofile = "/sbin/readprofile"
+FILES_util-linux-lscpu = "/usr/bin/lscpu"
 
 FILES_util-linux-libblkid = "/usr/lib/libblkid.so.*"
 FILES_util-linux-libblkid-dev = "/usr/lib/libblkid.so /usr/lib/libblkid.a /usr/lib/libblkid.la /usr/include/blkid"
diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index d0b1b41..082b3f0 100644
--- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
@@ -1,6 +1,6 @@
 MAJOR_VERSION = "2.17"
 require util-linux.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://uclibc-compile.patch \
 	          file://util-linux-ng-replace-siginterrupt.patch"
-- 
1.7.0

[PATCH 4/5] gst-plugins-base: add util-linux to DEPENDS

[Paul Eggleton]

gst-plugins-base requires libuuid, so add util-linux to DEPENDS.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Qing He <qing.he@intel.com>
---
 .../gstreamer/gst-plugins-base_0.10.31.bb          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb
index 77330b6..8bf243e 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
 
-DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi"
+DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi util-linux"
 RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
              gnome-vfs-plugin-sftp"
 
@@ -15,7 +15,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
 SRC_URI[md5sum] = "9baa0d87e81c88b2477a3554ab629c46"
 SRC_URI[sha256sum] = "abb006c78222cfb69d31e983268d1d5219e9d4e0da24c6c4cd687968af7a33bd"
 
-PR = "r0"
+PR = "r1"
 
 inherit gettext
 
-- 
1.7.0

[PATCH 2/5] util-linux: fix dangling symlinks

[Qing He]

shutdown and swapon should be in $base_sbindir instead of $sbindir

Signed-off-by: Qing He <qing.he@intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc       |   18 +++++++++++++-----
 meta/recipes-core/util-linux/util-linux_2.17.2.bb |    2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 44f7834..6830392 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -149,11 +149,19 @@ do_install () {
 	install -d ${D}${sysconfdir}/default/
 	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
 
-	ln -sf ${sbindir}/swapon ${D}${sbindir}/swapoff.${PN}
-	ln -sf ${sbindir}/shutdown ${D}${sbindir}/reboot.${PN}
-	ln -sf ${sbindir}/shutdown ${D}${sbindir}/halt.${PN}
-	ln -sf ${sbindir}/shutdown ${D}${sbindir}/fastboot
-	ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt
+	# note ${PN} in swapon.${PN}, swapon is an alternative link that is
+	# not guaranteed to provide multiple functions, similar for shutdown
+	ln -sf swapon.${PN} ${D}${base_sbindir}/swapoff.${PN}
+	ln -sf shutdown.${PN} ${D}${base_sbindir}/reboot.${PN}
+	ln -sf shutdown.${PN} ${D}${base_sbindir}/halt.${PN}
+	ln -sf shutdown.${PN} ${D}${base_sbindir}/fastboot
+	ln -sf shutdown.${PN} ${D}${base_sbindir}/fasthalt
+
+	rm -f ${D}${sbindir}/halt
+	rm -f ${D}${sbindir}/reboot
+	rm -f ${D}${sbindir}/fastboot
+	rm -f ${D}${sbindir}/fasthalt
+	rm -f ${D}${sbindir}/swapoff
 }
 
 pkg_postinst_${PN} () {
diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index 662bde0..d0b1b41 100644
--- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
@@ -1,6 +1,6 @@
 MAJOR_VERSION = "2.17"
 require util-linux.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://uclibc-compile.patch \
 	          file://util-linux-ng-replace-siginterrupt.patch"
-- 
1.7.0

[PATCH 1/5] util-linux: separately packaging blkid and uuid

[Qing He]

To avoid full set of util-linux included by library dependencies.

Fixes [BUGID #661].

Signed-off-by: Qing He <qing.he@intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc       |    9 ++++++++-
 meta/recipes-core/util-linux/util-linux_2.17.2.bb |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 53d8463..44f7834 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -27,7 +27,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/u
            file://make_include \
            "
 
-PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile "
+PACKAGES_prepend = "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 "
 
 PACKAGES_virtclass-native = ""
 
@@ -48,6 +50,11 @@ FILES_util-linux-mount = "/bin/mount.${PN}"
 FILES_util-linux-umount = "/bin/umount.${PN}"
 FILES_util-linux-readprofile = "/sbin/readprofile"
 
+FILES_util-linux-libblkid = "/usr/lib/libblkid.so.*"
+FILES_util-linux-libblkid-dev = "/usr/lib/libblkid.so /usr/lib/libblkid.a /usr/lib/libblkid.la /usr/include/blkid"
+FILES_util-linux-libuuid = "/usr/lib/libuuid.so.*"
+FILES_util-linux-libuuid-dev = "/usr/lib/libuuid.so /usr/lib/libuuid.a /usr/lib/libuuid.la /usr/include/uuid"
+
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
 RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
 
diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index 9b344d4..662bde0 100644
--- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
@@ -1,6 +1,6 @@
 MAJOR_VERSION = "2.17"
 require util-linux.inc
-PR="r1"
+PR = "r2"
 
 SRC_URI += "file://uclibc-compile.patch \
 	          file://util-linux-ng-replace-siginterrupt.patch"
-- 
1.7.0

[PATCH 5/5] nfs-utils, e2fsprogs, mtd-utils, libsm: bump PR

[Paul Eggleton]

This ensures package runtime dependencies are up-to-date after splitting
out libuuid and libblkid in util-linux recipe

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Qing He <qing.he@intel.com>
---
 .../nfs-utils/nfs-utils_1.2.3.bb                   |    2 +-
 .../e2fsprogs/e2fsprogs_1.41.12.bb                 |    2 +-
 meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb       |    2 +-
 meta/recipes-graphics/xorg-lib/libsm_1.2.0.bb      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
index a2bac61..b456474 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
@@ -13,7 +13,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
 RDEPENDS_${PN} = "portmap"
 RRECOMMENDS_${PN} = "kernel-module-nfsd"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
            file://nfs-utils-1.0.6-uclibc.patch \
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
index 3681ab3..ffe6dce 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r19"
+PR = "r20"
 
 SRC_URI += "file://quotefix.patch;patch=1 \
             file://acinclude.m4"
diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb b/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb
index 8189bff..5e6db0e 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb
@@ -11,7 +11,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=v${PV} \
 
 S = "${WORKDIR}/git/"
 
-PR = "r0"
+PR = "r1"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
 
diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.0.bb
index 5ce01b7..9ad5e4a 100644
--- a/meta/recipes-graphics/xorg-lib/libsm_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d98446615b962372d6a46057170043fa"
 
 DEPENDS += "libice xproto xtrans e2fsprogs"
 
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libSM"
-- 
1.7.0

Re: [PATCH 0/5] improvements for util-linux, v2

[Saul Wold]

On 01/21/2011 02:40 AM, Qing He wrote:
> change from v1:
>   - merges the change introduced by Paul Eggleton
>   - fix lscpu packaging (which is under GPLv3)
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: qhe/fix
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix
>
> Thanks,
>      Qing He
> ---
>
>
> Paul Eggleton (2):
>    gst-plugins-base: add util-linux to DEPENDS
>    nfs-utils, e2fsprogs, mtd-utils, libsm: bump PR
>
> Qing He (3):
>    util-linux: separately packaging blkid and uuid
>    util-linux: fix dangling symlinks
>    util-linux: fix lscpu packaging
>
>   .../nfs-utils/nfs-utils_1.2.3.bb                   |    2 +-
>   meta/recipes-core/util-linux/util-linux.inc        |   30 ++++++++++++++++----
>   meta/recipes-core/util-linux/util-linux_2.17.2.bb  |    2 +-
>   .../e2fsprogs/e2fsprogs_1.41.12.bb                 |    2 +-
>   meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb       |    2 +-
>   meta/recipes-graphics/xorg-lib/libsm_1.2.0.bb      |    2 +-
>   .../gstreamer/gst-plugins-base_0.10.31.bb          |    4 +-
>   7 files changed, 31 insertions(+), 13 deletions(-)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Pulled into Master

Thanks
	Sau!