summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-07-21 15:12:29 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-23 23:53:30 +0100
commit00a42b73b62b602f96afe23b015c6e07098b9926 (patch)
treee19ab724e8754b1d90ed64e97a0c863a88721b49
parentec6705a4889766da40cc493be578f11f59b88bfe (diff)
downloadpoky-00a42b73b62b602f96afe23b015c6e07098b9926.tar.gz
util-linux: upgrade to version 2.17.2
from 2.17 changes: - clarify license. the package does contains a standalone utility called lscpu that is under GPLv3+, fortunately it's note packaged as for now - the installation path of getopt has changed todo: - move libblkid and libuuid into separate packages Signed-off-by: Qing He <qing.he@intel.com>
-rw-r--r--meta/packages/util-linux/util-linux-2.17.2/tls.patch (renamed from meta/packages/util-linux/util-linux-2.17/tls.patch)0
-rw-r--r--meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch (renamed from meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch)0
-rw-r--r--meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch (renamed from meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch)0
-rw-r--r--meta/packages/util-linux/util-linux.inc16
-rw-r--r--meta/packages/util-linux/util-linux_2.17.2.bb (renamed from meta/packages/util-linux/util-linux_2.17.bb)1
5 files changed, 14 insertions, 3 deletions
diff --git a/meta/packages/util-linux/util-linux-2.17/tls.patch b/meta/packages/util-linux/util-linux-2.17.2/tls.patch
index bdb29cae1f..bdb29cae1f 100644
--- a/meta/packages/util-linux/util-linux-2.17/tls.patch
+++ b/meta/packages/util-linux/util-linux-2.17.2/tls.patch
diff --git a/meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch b/meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch
index b2e8a8b95a..b2e8a8b95a 100644
--- a/meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch
+++ b/meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch
diff --git a/meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch b/meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
index 4b5eb73760..4b5eb73760 100644
--- a/meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch
+++ b/meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
diff --git a/meta/packages/util-linux/util-linux.inc b/meta/packages/util-linux/util-linux.inc
index 733667a9c7..571b53c99c 100644
--- a/meta/packages/util-linux/util-linux.inc
+++ b/meta/packages/util-linux/util-linux.inc
@@ -1,12 +1,22 @@
1DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system." 1DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system."
2SECTION = "base" 2SECTION = "base"
3LICENSE = "GPL" 3
4# note that `lscpu' is under GPLv3+
5LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
6LICENSE_util-linux-lscpu = "GPLv3+"
7
8LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9 \
9 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
10 file://licenses/COPYING.GPL;md5=8ca43cbc842c2336e835926c2166c28b \
11 file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
12 file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
13
4DEPENDS = "udev zlib ncurses virtual/libintl gettext" 14DEPENDS = "udev zlib ncurses virtual/libintl gettext"
5DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native" 15DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native"
6 16
7inherit autotools 17inherit autotools
8 18
9SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}.tar.bz2 \ 19SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-ng-${PV}.tar.bz2 \
10 file://MCONFIG \ 20 file://MCONFIG \
11 file://swapargs.h \ 21 file://swapargs.h \
12 file://defines.h \ 22 file://defines.h \
@@ -23,7 +33,7 @@ EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elv
23 --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \ 33 --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
24 --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin --enable-libuuid --enable-libblkid --enable-fsck" 34 --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin --enable-libuuid --enable-libblkid --enable-fsck"
25 35
26FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*" 36FILES_${PN}-doc += "/usr/share/getopt/getopt-*.*"
27 37
28FILES_util-linux-fdisk = "/sbin/fdisk.${PN}" 38FILES_util-linux-fdisk = "/sbin/fdisk.${PN}"
29FILES_util-linux-cfdisk = "/sbin/cfdisk" 39FILES_util-linux-cfdisk = "/sbin/cfdisk"
diff --git a/meta/packages/util-linux/util-linux_2.17.bb b/meta/packages/util-linux/util-linux_2.17.2.bb
index b5d177fc7e..9efe64a6c6 100644
--- a/meta/packages/util-linux/util-linux_2.17.bb
+++ b/meta/packages/util-linux/util-linux_2.17.2.bb
@@ -1,3 +1,4 @@
1MAJOR_VERSION = "2.17"
1require util-linux.inc 2require util-linux.inc
2PR="r0" 3PR="r0"
3 4