diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-03-04 22:06:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-11 20:28:57 -0700 |
commit | 4a4be6f089c4dfba72ced1611417431c00a504a9 (patch) | |
tree | 9c869399d8268e513947f730d7e8ce503ae9b9c8 /meta/recipes-core/util-linux | |
parent | deed314f7812c81443bea217e441c0d60f20072b (diff) | |
download | poky-4a4be6f089c4dfba72ced1611417431c00a504a9.tar.gz |
util-linux: Update to 2.24.1
rebase native patch to remove sundisklabel as it's deprectated upstream
Update LIC_FILES_CHECKSUM for modified text, no License Changes
remove deprecated elvtune flag
Rebase the fix-configure patch due to change in configure.ac
(From OE-Core rev: f1faa0dcc6103fe720142b154ffbe3970f44d957)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 12 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/fix-configure.patch | 20 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/util-linux-native.patch | 173 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.24.1.bb (renamed from meta/recipes-core/util-linux/util-linux_2.23.2.bb) | 6 |
4 files changed, 37 insertions, 174 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4c80bf2930..51c982ae42 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -7,22 +7,22 @@ SECTION = "base" | |||
7 | 7 | ||
8 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" | 8 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" |
9 | 9 | ||
10 | LIC_FILES_CHKSUM = "file://README.licensing;md5=679af3e410ee112a5ec94de6501bf5c3 \ | 10 | LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c \ |
11 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 11 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
12 | file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 12 | file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
13 | file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ | 13 | file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ |
14 | file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \ | 14 | file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \ |
15 | file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \ | 15 | file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \ |
16 | file://libuuid/COPYING;md5=aa3ac5b4a5bcb707f714f78794011b80 \ | 16 | file://libuuid/COPYING;md5=b442ffb762cf8d3e9df1b99e0bb4af70 \ |
17 | file://libmount/COPYING;md5=152f98bc301a5ea649769ede7203ac82 \ | 17 | file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ |
18 | file://libblkid/COPYING;md5=152f98bc301a5ea649769ede7203ac82" | 18 | file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" |
19 | 19 | ||
20 | inherit autotools gettext pkgconfig systemd | 20 | inherit autotools gettext pkgconfig systemd |
21 | DEPENDS = "zlib ncurses" | 21 | DEPENDS = "zlib ncurses" |
22 | DEPENDS_append_class-native = " lzo-native" | 22 | DEPENDS_append_class-native = " lzo-native" |
23 | DEPENDS_append_class-nativesdk = " lzo-native" | 23 | DEPENDS_append_class-nativesdk = " lzo-native" |
24 | 24 | ||
25 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ | 25 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ |
26 | file://MCONFIG \ | 26 | file://MCONFIG \ |
27 | file://defines.h \ | 27 | file://defines.h \ |
28 | file://make_include \ | 28 | file://make_include \ |
@@ -39,7 +39,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
39 | util-linux-partx ${PN}-bash-completion" | 39 | util-linux-partx ${PN}-bash-completion" |
40 | 40 | ||
41 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ | 41 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ |
42 | --disable-makeinstall-chown --enable-elvtune \ | 42 | --disable-makeinstall-chown \ |
43 | --enable-kill --enable-last --enable-mesg --enable-partx \ | 43 | --enable-kill --enable-last --enable-mesg --enable-partx \ |
44 | --enable-raw --enable-reset --disable-login \ | 44 | --enable-raw --enable-reset --disable-login \ |
45 | --disable-vipw --disable-newgrp --disable-chfn-chsh \ | 45 | --disable-vipw --disable-newgrp --disable-chfn-chsh \ |
diff --git a/meta/recipes-core/util-linux/util-linux/fix-configure.patch b/meta/recipes-core/util-linux/util-linux/fix-configure.patch index 0ea23183ca..cefae97e9c 100644 --- a/meta/recipes-core/util-linux/util-linux/fix-configure.patch +++ b/meta/recipes-core/util-linux/util-linux/fix-configure.patch | |||
@@ -5,16 +5,16 @@ Upstream-Status: Pending | |||
5 | 5 | ||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | 6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
7 | 7 | ||
8 | Index: util-linux-2.22.1/configure.ac | 8 | Index: util-linux-2.24.1/configure.ac |
9 | =================================================================== | 9 | =================================================================== |
10 | --- util-linux-2.22.1.orig/configure.ac | 10 | --- util-linux-2.24.1.orig/configure.ac |
11 | +++ util-linux-2.22.1/configure.ac | 11 | +++ util-linux-2.24.1/configure.ac |
12 | @@ -79,7 +79,7 @@ fi | 12 | @@ -76,7 +76,7 @@ fi |
13 | AC_SUBST([usrsbin_execdir]) | 13 | AC_SUBST([usrsbin_execdir]) |
14 | 14 | ||
15 | case $libdir in | 15 | AS_CASE([$libdir], |
16 | - '${exec_prefix}/'* | '${prefix}/'* | /usr/*) | 16 | - ['${exec_prefix}/'* | '${prefix}/'* | /usr/*], |
17 | + ${exec_prefix}/* | ${prefix}/* | /usr/*) | 17 | + [${exec_prefix}/* | ${prefix}/* | /usr/*], |
18 | usrlib_execdir=$libdir ;; | 18 | [usrlib_execdir=$libdir], |
19 | *) | 19 | [usrlib_execdir='${exec_prefix}'$libdir] |
20 | usrlib_execdir='${exec_prefix}'$libdir ;; | 20 | ) |
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch index e8fcd98c64..afe543c6e8 100644 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch +++ b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch | |||
@@ -17,10 +17,11 @@ machines. | |||
17 | 17 | ||
18 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 18 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
19 | 19 | ||
20 | diff -ur util-linux-2.23/configure.ac /home/lmhatle/util-linux-2.23-fixed/configure.ac | 20 | Index: util-linux-2.24.1/configure.ac |
21 | --- util-linux-2.23/configure.ac 2013-05-29 14:44:35.147853585 -0500 | 21 | =================================================================== |
22 | +++ /home/lmhatle/util-linux-2.23-fixed/configure.ac 2013-05-30 14:56:15.050799650 -0500 | 22 | --- util-linux-2.24.1.orig/configure.ac |
23 | @@ -323,6 +323,7 @@ | 23 | +++ util-linux-2.24.1/configure.ac |
24 | @@ -302,6 +302,7 @@ AC_CHECK_FUNCS([ \ | ||
24 | llseek \ | 25 | llseek \ |
25 | lseek64 \ | 26 | lseek64 \ |
26 | mempcpy \ | 27 | mempcpy \ |
@@ -28,10 +29,11 @@ diff -ur util-linux-2.23/configure.ac /home/lmhatle/util-linux-2.23-fixed/config | |||
28 | nanosleep \ | 29 | nanosleep \ |
29 | personality \ | 30 | personality \ |
30 | posix_fadvise \ | 31 | posix_fadvise \ |
31 | diff -ur util-linux-2.23/include/c.h /home/lmhatle/util-linux-2.23-fixed/include/c.h | 32 | Index: util-linux-2.24.1/include/c.h |
32 | --- util-linux-2.23/include/c.h 2013-04-12 04:25:46.852156874 -0500 | 33 | =================================================================== |
33 | +++ /home/lmhatle/util-linux-2.23-fixed/include/c.h 2013-05-30 14:56:11.310799488 -0500 | 34 | --- util-linux-2.24.1.orig/include/c.h |
34 | @@ -236,6 +236,13 @@ | 35 | +++ util-linux-2.24.1/include/c.h |
36 | @@ -236,6 +236,13 @@ static inline int dirfd(DIR *d) | ||
35 | #endif | 37 | #endif |
36 | 38 | ||
37 | /* | 39 | /* |
@@ -45,9 +47,10 @@ diff -ur util-linux-2.23/include/c.h /home/lmhatle/util-linux-2.23-fixed/include | |||
45 | * MAXHOSTNAMELEN replacement | 47 | * MAXHOSTNAMELEN replacement |
46 | */ | 48 | */ |
47 | static inline size_t get_hostname_max(void) | 49 | static inline size_t get_hostname_max(void) |
48 | diff -ur util-linux-2.23/lib/randutils.c /home/lmhatle/util-linux-2.23-fixed/lib/randutils.c | 50 | Index: util-linux-2.24.1/lib/randutils.c |
49 | --- util-linux-2.23/lib/randutils.c 2013-04-12 04:25:46.855156901 -0500 | 51 | =================================================================== |
50 | +++ /home/lmhatle/util-linux-2.23-fixed/lib/randutils.c 2013-05-30 14:55:26.622799644 -0500 | 52 | --- util-linux-2.24.1.orig/lib/randutils.c |
53 | +++ util-linux-2.24.1/lib/randutils.c | ||
51 | @@ -16,6 +16,7 @@ | 54 | @@ -16,6 +16,7 @@ |
52 | #include <sys/syscall.h> | 55 | #include <sys/syscall.h> |
53 | 56 | ||
@@ -56,9 +59,10 @@ diff -ur util-linux-2.23/lib/randutils.c /home/lmhatle/util-linux-2.23-fixed/lib | |||
56 | 59 | ||
57 | #ifdef HAVE_TLS | 60 | #ifdef HAVE_TLS |
58 | #define THREAD_LOCAL static __thread | 61 | #define THREAD_LOCAL static __thread |
59 | diff -ur util-linux-2.23/lib/wholedisk.c /home/lmhatle/util-linux-2.23-fixed/lib/wholedisk.c | 62 | Index: util-linux-2.24.1/lib/wholedisk.c |
60 | --- util-linux-2.23/lib/wholedisk.c 2013-04-12 04:25:46.855156901 -0500 | 63 | =================================================================== |
61 | +++ /home/lmhatle/util-linux-2.23-fixed/lib/wholedisk.c 2013-05-30 14:55:31.182799350 -0500 | 64 | --- util-linux-2.24.1.orig/lib/wholedisk.c |
65 | +++ util-linux-2.24.1/lib/wholedisk.c | ||
62 | @@ -10,6 +10,7 @@ | 66 | @@ -10,6 +10,7 @@ |
63 | 67 | ||
64 | #include "blkdev.h" | 68 | #include "blkdev.h" |
@@ -67,144 +71,3 @@ diff -ur util-linux-2.23/lib/wholedisk.c /home/lmhatle/util-linux-2.23-fixed/lib | |||
67 | 71 | ||
68 | int is_whole_disk_fd(int fd, const char *name) | 72 | int is_whole_disk_fd(int fd, const char *name) |
69 | { | 73 | { |
70 | diff -ur util-linux-2.23/fdisks/fdisksunlabel.c /home/lmhatle/util-linux-2.23-fixed/fdisks/fdisksunlabel.c | ||
71 | --- util-linux-2.23/fdisks/fdisksunlabel.c 2013-04-23 09:14:19.229015244 -0500 | ||
72 | +++ /home/lmhatle/util-linux-2.23-fixed/fdisks/fdisksunlabel.c 2013-05-30 14:54:55.978799735 -0500 | ||
73 | @@ -383,10 +383,10 @@ | ||
74 | } | ||
75 | } | ||
76 | |||
77 | -static int verify_sun_cmp(int *a, int *b, void *data) | ||
78 | -{ | ||
79 | - unsigned int *verify_sun_starts = (unsigned int *) data; | ||
80 | +static unsigned int *verify_sun_starts; | ||
81 | |||
82 | +static int verify_sun_cmp(int *a, int *b) | ||
83 | +{ | ||
84 | if (*a == -1) | ||
85 | return 1; | ||
86 | if (*b == -1) | ||
87 | @@ -401,7 +401,6 @@ | ||
88 | uint32_t starts[SUN_MAXPARTITIONS], lens[SUN_MAXPARTITIONS], start, stop; | ||
89 | uint32_t i,j,k,starto,endo; | ||
90 | int array[SUN_MAXPARTITIONS]; | ||
91 | - unsigned int *verify_sun_starts; | ||
92 | |||
93 | assert(cxt); | ||
94 | assert(cxt->label); | ||
95 | @@ -442,16 +441,14 @@ | ||
96 | } | ||
97 | } | ||
98 | } | ||
99 | - | ||
100 | for (i = 0; i < SUN_MAXPARTITIONS; i++) { | ||
101 | if (lens[i]) | ||
102 | array[i] = i; | ||
103 | else | ||
104 | array[i] = -1; | ||
105 | } | ||
106 | - qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), | ||
107 | - (int (*)(const void *,const void *,void *)) verify_sun_cmp, | ||
108 | - verify_sun_starts); | ||
109 | + qsort(array,ARRAY_SIZE(array),sizeof(array[0]), | ||
110 | + (int (*)(const void *,const void *)) verify_sun_cmp); | ||
111 | |||
112 | if (array[0] == -1) { | ||
113 | fdisk_info(cxt, _("No partitions defined")); | ||
114 | @@ -468,6 +465,7 @@ | ||
115 | start = (starts[array[i]] + lens[array[i]]); | ||
116 | if (start < stop) | ||
117 | fdisk_warnx(cxt, _("Unused gap - sectors %d-%d"), start, stop); | ||
118 | + | ||
119 | return 0; | ||
120 | } | ||
121 | |||
122 | @@ -746,18 +744,12 @@ | ||
123 | } | ||
124 | } | ||
125 | |||
126 | - | ||
127 | void fdisk_sun_set_alt_cyl(struct fdisk_context *cxt) | ||
128 | { | ||
129 | struct sun_disklabel *sunlabel = self_disklabel(cxt); | ||
130 | - uintmax_t res; | ||
131 | - int rc = fdisk_ask_number(cxt, 0, /* low */ | ||
132 | - be16_to_cpu(sunlabel->acyl), /* default */ | ||
133 | - 65535, /* high */ | ||
134 | - _("Number of alternate cylinders"), /* query */ | ||
135 | - &res); /* result */ | ||
136 | - if (!rc) | ||
137 | - sunlabel->acyl = cpu_to_be16(res); | ||
138 | + sunlabel->acyl = | ||
139 | + cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->acyl), 65535, 0, | ||
140 | + _("Number of alternate cylinders"))); | ||
141 | } | ||
142 | |||
143 | void fdisk_sun_set_ncyl(struct fdisk_context *cxt, int cyl) | ||
144 | @@ -769,54 +761,33 @@ | ||
145 | void fdisk_sun_set_xcyl(struct fdisk_context *cxt) | ||
146 | { | ||
147 | struct sun_disklabel *sunlabel = self_disklabel(cxt); | ||
148 | - uintmax_t res; | ||
149 | - int rc = fdisk_ask_number(cxt, 0, /* low */ | ||
150 | - be16_to_cpu(sunlabel->apc), /* default */ | ||
151 | - cxt->geom.sectors, /* high */ | ||
152 | - _("Extra sectors per cylinder"), /* query */ | ||
153 | - &res); /* result */ | ||
154 | - if (!rc) | ||
155 | - sunlabel->apc = cpu_to_be16(res); | ||
156 | + sunlabel->apc = | ||
157 | + cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->apc), cxt->geom.sectors, 0, | ||
158 | + _("Extra sectors per cylinder"))); | ||
159 | } | ||
160 | |||
161 | void fdisk_sun_set_ilfact(struct fdisk_context *cxt) | ||
162 | { | ||
163 | struct sun_disklabel *sunlabel = self_disklabel(cxt); | ||
164 | - uintmax_t res; | ||
165 | - int rc = fdisk_ask_number(cxt, 1, /* low */ | ||
166 | - be16_to_cpu(sunlabel->intrlv), /* default */ | ||
167 | - 32, /* high */ | ||
168 | - _("Interleave factor"), /* query */ | ||
169 | - &res); /* result */ | ||
170 | - if (!rc) | ||
171 | - sunlabel->intrlv = cpu_to_be16(res); | ||
172 | + sunlabel->intrlv = | ||
173 | + cpu_to_be16(read_int(cxt, 1, be16_to_cpu(sunlabel->intrlv), 32, 0, | ||
174 | + _("Interleave factor"))); | ||
175 | } | ||
176 | |||
177 | void fdisk_sun_set_rspeed(struct fdisk_context *cxt) | ||
178 | { | ||
179 | struct sun_disklabel *sunlabel = self_disklabel(cxt); | ||
180 | - uintmax_t res; | ||
181 | - int rc = fdisk_ask_number(cxt, 1, /* low */ | ||
182 | - be16_to_cpu(sunlabel->rpm), /* default */ | ||
183 | - USHRT_MAX, /* high */ | ||
184 | - _("Rotation speed (rpm)"), /* query */ | ||
185 | - &res); /* result */ | ||
186 | - if (!rc) | ||
187 | - sunlabel->rpm = cpu_to_be16(res); | ||
188 | - | ||
189 | + sunlabel->rpm = | ||
190 | + cpu_to_be16(read_int(cxt, 1, be16_to_cpu(sunlabel->rpm), 100000, 0, | ||
191 | + _("Rotation speed (rpm)"))); | ||
192 | } | ||
193 | |||
194 | void fdisk_sun_set_pcylcount(struct fdisk_context *cxt) | ||
195 | { | ||
196 | struct sun_disklabel *sunlabel = self_disklabel(cxt); | ||
197 | - uintmax_t res; | ||
198 | - int rc = fdisk_ask_number(cxt, 0, /* low */ | ||
199 | - be16_to_cpu(sunlabel->pcyl), /* default */ | ||
200 | - USHRT_MAX, /* high */ | ||
201 | - _("Number of physical cylinders"), /* query */ | ||
202 | - &res); /* result */ | ||
203 | - if (!rc) | ||
204 | - sunlabel->pcyl = cpu_to_be16(res); | ||
205 | + sunlabel->pcyl = | ||
206 | + cpu_to_be16(read_int(cxt, 0, be16_to_cpu(sunlabel->pcyl), 65535, 0, | ||
207 | + _("Number of physical cylinders"))); | ||
208 | } | ||
209 | |||
210 | static int sun_write_disklabel(struct fdisk_context *cxt) | ||
diff --git a/meta/recipes-core/util-linux/util-linux_2.23.2.bb b/meta/recipes-core/util-linux/util-linux_2.24.1.bb index f65932cb20..b08d68df76 100644 --- a/meta/recipes-core/util-linux/util-linux_2.23.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.24.1.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | MAJOR_VERSION = "2.23" | 1 | MAJOR_VERSION = "2.24" |
2 | require util-linux.inc | 2 | require util-linux.inc |
3 | 3 | ||
4 | # To support older hosts, we need to patch and/or revert | 4 | # To support older hosts, we need to patch and/or revert |
@@ -14,8 +14,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ | |||
14 | ${OLDHOST} \ | 14 | ${OLDHOST} \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[md5sum] = "39a02ad0b3b37824c394f40930b7aa38" | 17 | SRC_URI[md5sum] = "88d46ae23ca599ac5af9cf96b531590f" |
18 | SRC_URI[sha256sum] = "6c5be3f7beec91b4893de14bbd722886fa2521be5bfa0fc079b749d0018633b1" | 18 | SRC_URI[sha256sum] = "835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410" |
19 | 19 | ||
20 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" | 20 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" |
21 | EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ | 21 | EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ |