osc copypac from project:Base:System package:filesystem revision:211
OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=213
This commit is contained in:
parent
0aa47add43
commit
1868e87b52
@ -1,9 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 23 11:49:33 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- use %ghost for /bin, /sbin, /lib and /lib64 to avoid file conflict
|
||||
with pre-usrmerge filesystem package (boo#1188847).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 2 07:55:40 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
|
@ -2,4 +2,4 @@
|
||||
# Required for FHS 2.1
|
||||
spool/mail /var/mail
|
||||
# systemd
|
||||
../run /var/run %ghost
|
||||
../run /var/run
|
||||
|
@ -161,11 +161,11 @@ echo "%%defattr(-,root,root)" > filesystem.list
|
||||
cat %{SOURCE64} >> directory.list
|
||||
%endif
|
||||
cat >> filesystem.links << EOF
|
||||
usr/bin /bin %%ghost
|
||||
usr/sbin /sbin %%ghost
|
||||
usr/lib /lib %%ghost
|
||||
usr/bin /bin
|
||||
usr/sbin /sbin
|
||||
usr/lib /lib
|
||||
%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64
|
||||
usr/lib64 /lib64 %%ghost
|
||||
usr/lib64 /lib64
|
||||
%endif
|
||||
EOF
|
||||
cat >> directory.list <<EOF
|
||||
@ -176,9 +176,9 @@ while read MOD OWN GRP NAME ; do
|
||||
create_dir $MOD $OWN $GRP $NAME
|
||||
done < directory.list
|
||||
# ghost files next
|
||||
while read MOD OWN GRP NAME ; do
|
||||
cat ghost.list | while read MOD OWN GRP NAME ; do
|
||||
create_dir $MOD $OWN $GRP $NAME "%%ghost "
|
||||
done < ghost.list
|
||||
done
|
||||
# arch specific leftovers
|
||||
for march in \
|
||||
%ifarch %ix86
|
||||
@ -216,7 +216,7 @@ done
|
||||
create_dir 0755 root root /emul/ia32-linux
|
||||
%endif
|
||||
# now do the links
|
||||
while read SRC DEST ATTR ; do
|
||||
while read SRC DEST ; do
|
||||
case $SRC in
|
||||
"") continue ;;
|
||||
\#*) echo "comment: $SRC $DEST" ;;
|
||||
@ -229,7 +229,8 @@ case $SRC in
|
||||
esac
|
||||
ln -sf $SRC $RPM_BUILD_ROOT$DEST
|
||||
case $DEST in
|
||||
*) echo "$ATTR${ATTR:+ }$DEST" >> filesystem.list ;;
|
||||
/var/run|/var/lock) echo "%ghost $DEST" >> filesystem.list ;;
|
||||
*) echo "$DEST" >> filesystem.list ;;
|
||||
esac
|
||||
# for tmpfiles.d
|
||||
case $DEST in
|
||||
|
Loading…
Reference in New Issue
Block a user