* [PATCH 1/2] util-linux: separately packaging blkid and uuid
2011-01-19 7:22 [PATCH 0/2] improvement for util-linux Qing He
2011-01-19 7:22 ` [PATCH 2/2] util-linux: fix dangling symlinks Qing He
@ 2011-01-19 7:22 ` Qing He
2011-01-20 23:22 ` [PATCH 0/2] improvement for util-linux Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Qing He @ 2011-01-19 7:22 UTC (permalink / raw)
To: poky; +Cc: aleksandr.koltsoff
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..fe002c0 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 \
+ 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"
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..a287857 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] util-linux: fix dangling symlinks
2011-01-19 7:22 [PATCH 0/2] improvement for util-linux Qing He
@ 2011-01-19 7:22 ` Qing He
2011-01-19 7:22 ` [PATCH 1/2] util-linux: separately packaging blkid and uuid Qing He
2011-01-20 23:22 ` [PATCH 0/2] improvement for util-linux Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Qing He @ 2011-01-19 7:22 UTC (permalink / raw)
To: poky; +Cc: aleksandr.koltsoff
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 fe002c0..d55d13a 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 a287857..ecd0115 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 0/2] improvement for util-linux
@ 2011-01-19 7:22 Qing He
2011-01-19 7:22 ` [PATCH 2/2] util-linux: fix dangling symlinks Qing He
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Qing He @ 2011-01-19 7:22 UTC (permalink / raw)
To: poky; +Cc: aleksandr.koltsoff
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(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] improvement for util-linux
2011-01-19 7:22 [PATCH 0/2] improvement for util-linux Qing He
2011-01-19 7:22 ` [PATCH 2/2] util-linux: fix dangling symlinks Qing He
2011-01-19 7:22 ` [PATCH 1/2] util-linux: separately packaging blkid and uuid Qing He
@ 2011-01-20 23:22 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-01-20 23:22 UTC (permalink / raw)
To: Qing He; +Cc: poky, aleksandr.koltsoff
On 01/18/2011 11:22 PM, Qing He wrote:
> 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!
> 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
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-01-20 23:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-19 7:22 [PATCH 0/2] improvement for util-linux Qing He
2011-01-19 7:22 ` [PATCH 2/2] util-linux: fix dangling symlinks Qing He
2011-01-19 7:22 ` [PATCH 1/2] util-linux: separately packaging blkid and uuid Qing He
2011-01-20 23:22 ` [PATCH 0/2] improvement for util-linux Saul Wold
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.