diff options
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 5 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch | 15 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.32.bb (renamed from meta/recipes-core/util-linux/util-linux_2.31.bb) | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 157416df48..0b7db529fd 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -86,7 +86,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" | |||
86 | FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" | 86 | FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" |
87 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" | 87 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" |
88 | FILES_util-linux-uuidd = "${sbindir}/uuidd" | 88 | FILES_util-linux-uuidd = "${sbindir}/uuidd" |
89 | FILES_util-linux-rfkill = "${base_bindir}/rfkill*" | 89 | FILES_util-linux-rfkill = "${sbindir}/rfkill*" |
90 | FILES_util-linux-partx = "${sbindir}/partx" | 90 | FILES_util-linux-partx = "${sbindir}/partx" |
91 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" | 91 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" |
92 | FILES_util-linux-findfs = "${sbindir}/findfs" | 92 | FILES_util-linux-findfs = "${sbindir}/findfs" |
@@ -157,7 +157,7 @@ do_install () { | |||
157 | 157 | ||
158 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" | 158 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" |
159 | sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" | 159 | sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin" |
160 | binprogs_a="dmesg getopt kill more umount mount login rfkill su mountpoint" | 160 | binprogs_a="dmesg getopt kill more umount mount login su mountpoint" |
161 | 161 | ||
162 | if [ "${base_sbindir}" != "${sbindir}" ]; then | 162 | if [ "${base_sbindir}" != "${sbindir}" ]; then |
163 | mkdir -p ${D}${base_sbindir} | 163 | mkdir -p ${D}${base_sbindir} |
@@ -272,7 +272,6 @@ ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" | |||
272 | 272 | ||
273 | ALTERNATIVE_util-linux-rfkill = "rfkill" | 273 | ALTERNATIVE_util-linux-rfkill = "rfkill" |
274 | ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" | 274 | ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" |
275 | ALTERNATIVE_TARGET[rfkill] = "${base_bindir}/rfkill" | ||
276 | 275 | ||
277 | ALTERNATIVE_util-linux-getopt = "getopt" | 276 | ALTERNATIVE_util-linux-getopt = "getopt" |
278 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | 277 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" |
diff --git a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch index 46d4d37650..748b6ef096 100644 --- a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +++ b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch | |||
@@ -5,15 +5,16 @@ Revert run.sh script accordingly to serialize running tests | |||
5 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | 5 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
8 | diff -ruN a/configure.ac b/configure.ac | 8 | Index: util-linux-2.32/configure.ac |
9 | --- a/configure.ac 2014-05-27 12:37:42.119772658 +0200 | 9 | =================================================================== |
10 | +++ b/configure.ac 2014-05-27 12:41:46.225573272 +0200 | 10 | --- util-linux-2.32.orig/configure.ac |
11 | @@ -10,7 +10,7 @@ | 11 | +++ util-linux-2.32/configure.ac |
12 | @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4]) | ||
12 | dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run | 13 | dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run |
13 | dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors. | 14 | dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors. |
14 | AC_USE_SYSTEM_EXTENSIONS | 15 | AC_USE_SYSTEM_EXTENSIONS |
15 | -AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability subdir-objects]) | 16 | -AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax no-dist-gzip dist-xz subdir-objects]) |
16 | +AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability subdir-objects serial-tests]) | 17 | +AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax no-dist-gzip dist-xz subdir-objects serial-tests]) |
17 | 18 | ||
18 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], | 19 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], |
19 | [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) | 20 | [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) |
diff --git a/meta/recipes-core/util-linux/util-linux_2.31.bb b/meta/recipes-core/util-linux/util-linux_2.32.bb index 7f7a78ef60..55cc98c200 100644 --- a/meta/recipes-core/util-linux/util-linux_2.31.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | MAJOR_VERSION = "2.31" | 1 | MAJOR_VERSION = "2.32" |
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 |
@@ -15,8 +15,8 @@ SRC_URI += "file://configure-sbindir.patch \ | |||
15 | file://display_testname_for_subtest.patch \ | 15 | file://display_testname_for_subtest.patch \ |
16 | file://avoid_parallel_tests.patch \ | 16 | file://avoid_parallel_tests.patch \ |
17 | " | 17 | " |
18 | SRC_URI[md5sum] = "5b6821c403c3cc6e7775f74df1882a20" | 18 | SRC_URI[md5sum] = "e0d8a25853f88cd15ff557e5d8cb4ea7" |
19 | SRC_URI[sha256sum] = "f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a" | 19 | SRC_URI[sha256sum] = "6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734" |
20 | 20 | ||
21 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" | 21 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" |
22 | 22 | ||