Skip to contentSkip to conversation

improvement for util-linux

PATCH In review Qing He 2 participants 4 messages Jan 19, 2011 – Jan 20, 2011

lore
Share & tools
lore

Qing He

author
#0 lore raw

cover improvement for util-linux

this patch set adjusts the packaging policy of util-linux, separating out shared libraries for flexibility, it also fixes the dangling symlink exists in the recipe.

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
---

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

 meta/recipes-core/util-linux/util-linux.inc       |   27 ++++++++++++++++----
 meta/recipes-core/util-linux/util-linux_2.17.2.bb |    2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)
author
#1 lore raw

PATCH 1/2 util-linux: separately packaging blkid and uuid

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

Fixes [BUGID #661].

Signed-off-by Qing He <[email protected]>
---
 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(-)
meta/recipes-core/util-linux/util-linux.inc +8 -1
index 53d8463..fe002c0 100644
@@ -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 \
+                    libblkid libblkid-dev libuuid 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_libblkid = "/usr/lib/libblkid.so.*"
+FILES_libblkid-dev = "/usr/lib/libblkid.so /usr/lib/libblkid.a /usr/lib/libblkid.la /usr/include/blkid"
+FILES_libuuid = "/usr/lib/libuuid.so.*"
+FILES_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"
meta/recipes-core/util-linux/util-linux_2.17.2.bb +1 -1
index 9b344d4..a287857 100644
@@ -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"
Signature · 1 line
1.7.0
author
#2 lore raw

PATCH 2/2 util-linux: fix dangling symlinks

In reply to Qing He

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

Signed-off-by Qing He <[email protected]>
---
 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(-)
meta/recipes-core/util-linux/util-linux.inc +13 -5
index fe002c0..d55d13a 100644
@@ -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} () {
meta/recipes-core/util-linux/util-linux_2.17.2.bb +1 -1
index a287857..ecd0115 100644
@@ -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"
Signature · 1 line
1.7.0
#3 lore raw
In reply to Qing He
Quoted 4 lines · Qing He

this patch set adjusts the packaging policy of util-linux, separating out shared libraries for flexibility, it also fixes the dangling symlink exists in the recipe.

Qing,

Please refer to Paul's email about the pacage naming and bumping PR in other recipes.

Sau!

Quoted 22 lines

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
---

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

  meta/recipes-core/util-linux/util-linux.inc       |   27 ++++++++++++++++----
  meta/recipes-core/util-linux/util-linux_2.17.2.bb |    2 +-
  2 files changed, 22 insertions(+), 7 deletions(-)

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky