pool/filesystem
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 39060 from Base:System

Browse Source 
checked in (request 39060)

OBS-URL: https://build.opensuse.org/request/show/39060
OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=28
This commit is contained in:
OBS User autobuild 2010-04-28 23:07:43 +00:00 committed by Git OBS Bridge
parent 70a0fab3f3
commit c6f45c70cb
4 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
directory.list
View File

@ -42,7 +42,6 @@
0700 root root /etc/sysconfig/network/providers
0755 root root /etc/sysconfig/network/scripts
0755 root root /etc/sysconfig/scripts
0755 root root /etc/tmpdirs.d
0750 news news /etc/news
0755 root root /etc/opt
0750 root dialout /etc/ppp
@ -59,6 +58,8 @@
0755 root root /lib/modules
0755 root root /lib/firmware
0755 root root /media
0755 root root /media/cdrom
0755 root root /media/floppy
0755 root root /mnt
0755 root root /opt
0555 root root /proc
@ -74,6 +75,8 @@
0755 root root /srv/www/htdocs
0755 root root /sys
1777 root root /tmp
1777 root root /tmp/.X11-unix
1777 root root /tmp/.ICE-unix
0755 root root /usr
0755 root root /usr/X11R6
0755 root root /usr/X11R6/bin
@ -183,6 +186,7 @@
0755 uucp uucp /var/spool/uucp
0755 root root /var/spool/uucp/uucp
1777 root root /var/tmp
1777 root root /var/tmp/vi.recover
0755 root root /var/log
0755 root root /var/opt
0700 root root /var/adm/update-scripts

15
filesystem.changes
View File

@ -1,18 +1,3 @@
-------------------------------------------------------------------
Wed Apr 28 17:04:20 CEST 2010 - ro@suse.de
- add ghost.list with directories only listed in this package
as ghost files, move /tmp/.X11-unix, /tmp/.ICE-unix
and /var/tmp/vi.recover to that list
- also move /media/cdrom and /media/floppy to that list
they were done manually as ghosts in the specfile before
- add /etc/tmpdirs.d (see aaa_base)
-------------------------------------------------------------------
Tue Apr 27 10:20:52 UTC 2010 - aj@suse.de
- Set version number to 11.3
-------------------------------------------------------------------
Tue Mar 9 13:58:27 UTC 2010 - lnussel@suse.de

21
filesystem.spec
View File

@ -23,7 +23,7 @@ License: GPLv2+
Group: System/Fhs
AutoReqProv: on
Summary: Basic Directory Layout
Version: 11.3
Version: 11.2
Release: 18
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: aaa_dir
@ -31,7 +31,6 @@ Provides: aaa_dir
Source: directory.list
Source1: filesystem.links
Source2: languages
Source3: ghost.list
Source64: directory.list64
%prep
@ -52,26 +51,26 @@ function create_dir () {
}
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
# generic directories first
echo "%%defattr(-,root,root)" > filesystem.list
{
cat %{SOURCE0}
%ifarch s390x %sparc x86_64 ppc64 ppc
cat %{SOURCE64}
%endif
} | while read MOD OWN GRP NAME ; do
create_dir $MOD $OWN $GRP $NAME
done
# ghost files next
cat %{SOURCE3} | while read MOD OWN GRP NAME ; do
} |
while read MOD OWN GRP NAME ; do
%ifarch s390 s390x
case $NAME in
/media/floppy|/media/cdrom) continue ;;
/media/floppy|/media/cdrom|/floppy|/cdrom) continue ;;
esac
%endif
create_dir $MOD $OWN $GRP $NAME "%%verify(not mode) %%ghost "
case $NAME in
/media/floppy|/media/cdrom)
create_dir $MOD $OWN $GRP $NAME "%%verify(not mode) %%ghost "
continue ;;
esac
create_dir $MOD $OWN $GRP $NAME
done
# arch specific leftovers
for march in \
%ifarch %ix86
i586-suse-linux \

5
ghost.list
View File

@ -1,5 +0,0 @@
0755 root root /media/cdrom
0755 root root /media/floppy
1777 root root /tmp/.X11-unix
1777 root root /tmp/.ICE-unix
1777 root root /var/tmp/vi.recover