rpm/filesystem
SHA256
1
0
Fork 0
forked from pool/filesystem
Code Pull Requests Activity

Accepting request 1042486 from home:dirkmueller:Factory

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2022-12-13 11:51:31 +00:00 committed by Git OBS Bridge
parent 46d3fb4103
commit 54de76affc
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
directory.list64-x86_64 Normal file
View File

@ -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

5
filesystem.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 8 14:18:11 UTC 2022 - Dirk Müller <dmueller@suse.com>
- add subdirectories for x86_64 hwcaps
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 7 15:59:46 UTC 2022 - Thorsten Kukuk <kukuk@suse.com> Wed Dec 7 15:59:46 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>

16
filesystem.spec
View File

@ -41,7 +41,8 @@ Source2: languages
Source3: ghost.list Source3: ghost.list
Source4: languages.man Source4: languages.man
Source64: directory.list64 Source64: directory.list64
Source65: ghost.list64 Source65: directory.list64-x86_64
Source66: ghost.list64
Source99: LICENSE.txt Source99: LICENSE.txt
%description %description
@ -53,8 +54,8 @@ the home directories of system users.
cp %{SOURCE0} . cp %{SOURCE0} .
cp %{SOURCE1} . cp %{SOURCE1} .
cp %{SOURCE3} . cp %{SOURCE3} .
%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64 %ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64
cat %{SOURCE65} >> ghost.list cat %{SOURCE66} >> ghost.list
%endif %endif
%build %build
@ -109,7 +110,7 @@ cat > pre.lua <<'EOF'
needmigrate = false needmigrate = false
local dirs = {"/bin", local dirs = {"/bin",
"/sbin", "/sbin",
%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64 %ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64
"/lib64", "/lib64",
%endif %endif
"/lib" } "/lib" }
@ -174,14 +175,17 @@ function create_dir () {
mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT
# generic directories first # generic directories first
echo "%%defattr(-,root,root)" > filesystem.list 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 cat %{SOURCE64} >> directory.list
%endif %endif
%ifarch x86_64 %x86_64
cat %{SOURCE65} >> directory.list
%endif
cat >> filesystem.links << EOF cat >> filesystem.links << EOF
usr/bin /bin usr/bin /bin
usr/sbin /sbin usr/sbin /sbin
usr/lib /lib 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 usr/lib64 /lib64
%endif %endif
EOF EOF