From 54de76affcbb535f230a0f8b96de7662f3083804dc3e3cfc1e2ffcec06e39afc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Dec 2022 11:51:31 +0000 Subject: [PATCH] Accepting request 1042486 from home:dirkmueller:Factory - add subdirectories for x86_64 hwcaps OBS-URL: https://build.opensuse.org/request/show/1042486 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=231 --- directory.list64-x86_64 | 3 +++ filesystem.changes | 5 +++++ filesystem.spec | 16 ++++++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 directory.list64-x86_64 diff --git a/directory.list64-x86_64 b/directory.list64-x86_64 new file mode 100644 index 0000000..7a5eda8 --- /dev/null +++ b/directory.list64-x86_64 @@ -0,0 +1,3 @@ +0555 root root /usr/lib64/glibc-hwcaps/x86-64-v4 +0555 root root /usr/lib64/glibc-hwcaps/x86-64-v3 +0555 root root /usr/lib64/glibc-hwcaps/x86-64-v2 diff --git a/filesystem.changes b/filesystem.changes index c5e0b0e..c37903f 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 8 14:18:11 UTC 2022 - Dirk Müller + +- add subdirectories for x86_64 hwcaps + ------------------------------------------------------------------- Wed Dec 7 15:59:46 UTC 2022 - Thorsten Kukuk diff --git a/filesystem.spec b/filesystem.spec index 91ef0a0..9c1bfa9 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -41,7 +41,8 @@ Source2: languages Source3: ghost.list Source4: languages.man Source64: directory.list64 -Source65: ghost.list64 +Source65: directory.list64-x86_64 +Source66: ghost.list64 Source99: LICENSE.txt %description @@ -53,8 +54,8 @@ the home directories of system users. cp %{SOURCE0} . cp %{SOURCE1} . cp %{SOURCE3} . -%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64 -cat %{SOURCE65} >> ghost.list +%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64 +cat %{SOURCE66} >> ghost.list %endif %build @@ -109,7 +110,7 @@ cat > pre.lua <<'EOF' needmigrate = false local dirs = {"/bin", "/sbin", -%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64 +%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64 "/lib64", %endif "/lib" } @@ -174,14 +175,17 @@ function create_dir () { mkdir -p $RPM_BUILD_ROOT # generic directories first echo "%%defattr(-,root,root)" > filesystem.list -%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64 +%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64 cat %{SOURCE64} >> directory.list %endif +%ifarch x86_64 %x86_64 +cat %{SOURCE65} >> directory.list +%endif cat >> filesystem.links << EOF usr/bin /bin usr/sbin /sbin usr/lib /lib -%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64 +%ifarch s390x %sparc %x86_64 ppc64 ppc aarch64 ppc64le riscv64 usr/lib64 /lib64 %endif EOF