forked from pool/util-linux
Marcus Meissner
1806747cca
- Merge fixes and features from SLE11 (bnc#831868):
* Detect squashfs version <= 3 as squashfs3 and version >= 4 as
squashfs. (mszeredi@suse.cz,
util-linux-ng-2.16-squashfs3-detect.patch, bnc#666893)
* add sfdisk-warn-about-2TB-limit.patch (puzel@novell.com,
bnc#495657)
* Document barrier option in mount.8 (jack@suse.cz,
hvogel@suse.de,
util-linux-ng-2.19.1-barrier_documentation.patch, bnc#489740)
* lscpu: improve hypervisor detection (puzel@novell.com,
fate#310255)
- util-linux-lscpu-improve-hypervisor-detection.patch
* umount: avoid calling readlink on mountpoints if not necessary
- add: umount-avoid-readlink.patch (puzel@suse.com, bnc#794529)
* fix file conflict between util-linux and s390-32
(puzel@suse.com, bnc#805684)
* util-linux-update-default-commit-interval.patch:
mount(8): update default commit interval (puzel@suse.com,
bnc#809480)
* Obsolete no more packaged uuid-runtime.
- Add uname26 (util-linux-setarch-uname26.patch, FATE#313476).
OBS-URL: https://build.opensuse.org/request/show/226509
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=227
26 lines
954 B
Diff
26 lines
954 B
Diff
Index: util-linux-2.24/sys-utils/setarch.c
|
|
===================================================================
|
|
--- util-linux-2.24.orig/sys-utils/setarch.c
|
|
+++ util-linux-2.24/sys-utils/setarch.c
|
|
@@ -146,6 +146,7 @@ set_arch(const char *pers, unsigned long
|
|
int perval;
|
|
const char *target_arch, *result_arch;
|
|
} transitions[] = {
|
|
+ {UNAME26, "uname26", NULL},
|
|
{PER_LINUX32, "linux32", NULL},
|
|
{PER_LINUX, "linux64", NULL},
|
|
#if defined(__powerpc__) || defined(__powerpc64__)
|
|
Index: util-linux-2.24/sys-utils/Makemodule.am
|
|
===================================================================
|
|
--- util-linux-2.24.orig/sys-utils/Makemodule.am
|
|
+++ util-linux-2.24/sys-utils/Makemodule.am
|
|
@@ -89,7 +89,7 @@ usrbin_exec_PROGRAMS += setarch
|
|
dist_man_MANS += sys-utils/setarch.8
|
|
setarch_SOURCES = sys-utils/setarch.c
|
|
|
|
-SETARCH_LINKS = linux32 linux64
|
|
+SETARCH_LINKS = uname26 linux32 linux64
|
|
|
|
if ARCH_S390
|
|
SETARCH_LINKS += s390 s390x
|