From 9a3ff1faa252ce2e6360332423a5078ea7197eff6ee7e0d6ed2daf662c277650 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Thu, 3 Sep 2020 08:49:55 +0000 Subject: [PATCH 1/2] Accepting request 831547 from home:sbrabec:branches:util-linux-multibuild - Add /usr/etc/default. OBS-URL: https://build.opensuse.org/request/show/831547 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=181 --- directory.list | 1 + filesystem.changes | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/directory.list b/directory.list index 755ae6d..b51769b 100644 --- a/directory.list +++ b/directory.list @@ -48,6 +48,7 @@ 0755 root root /usr 0755 root root /usr/bin 0755 root root /usr/etc +0755 root root /usr/etc/default 0755 root root /usr/include 0755 root root /usr/include/X11 0755 root root /usr/lib diff --git a/filesystem.changes b/filesystem.changes index 694e389..8794724 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 3 00:47:28 UTC 2020 - Stanislav Brabec + +- Add /usr/etc/default. + ------------------------------------------------------------------- Mon Aug 10 12:14:40 UTC 2020 - Thorsten Kukuk From f448812d9f300cfc1f1dc226c0755ff32bc1971c3bd702f414cef924598e4686 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 4 Sep 2020 14:01:00 +0000 Subject: [PATCH 2/2] Accepting request 832120 from home:kukuk:etc - Split /var/tmp out of fs-var.conf, new file is fs-var-tmp.conf. Allows to override config to add cleanup options of /var/tmp [bsc#1078466] - Create fs-tmp.conf to cleanup /tmp regular (required with tmpfs) [bsc#1175519] - Fix bug about missing group in tmpfiles.d files - Generic cleanup: - Remove /usr/local/games - /etc/java was moved to javapackages-filesystem long ago - Remove unused languages: en@IPA, it_CH, ja_JP.EUC, ja_JP.SJIS, ja_JP.eucJP, nds_DE - Remove %ghost entries for /tmp, /tmp is now tmpfs and the files are handled by systemd since a long time OBS-URL: https://build.opensuse.org/request/show/832120 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=182 --- directory.list | 2 -- filesystem.changes | 17 +++++++++++++++++ filesystem.spec | 12 +++++++++++- ghost.list | 2 -- languages | 6 ------ 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/directory.list b/directory.list index b51769b..7524f84 100644 --- a/directory.list +++ b/directory.list @@ -5,7 +5,6 @@ 0755 root root /etc/X11 0755 root root /etc/aliases.d 0755 root root /etc/default -0755 root root /etc/java 0755 root root /etc/ld.so.conf.d 0755 root root /etc/logrotate.d 0755 root root /etc/modprobe.d @@ -71,7 +70,6 @@ 0755 root root /usr/lib/udev/rules.d 0755 root root /usr/local 0755 root root /usr/local/bin -0755 root root /usr/local/games 0755 root root /usr/local/include 0755 root root /usr/local/lib 0755 root root /usr/local/libexec diff --git a/filesystem.changes b/filesystem.changes index 8794724..8e58b1a 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Sep 4 12:14:08 UTC 2020 - Thorsten Kukuk + +- Split /var/tmp out of fs-var.conf, new file is fs-var-tmp.conf. + Allows to override config to add cleanup options of /var/tmp + [bsc#1078466] +- Create fs-tmp.conf to cleanup /tmp regular (required with tmpfs) + [bsc#1175519] +- Fix bug about missing group in tmpfiles.d files +- Generic cleanup: + - Remove /usr/local/games + - /etc/java was moved to javapackages-filesystem long ago + - Remove unused languages: en@IPA, it_CH, ja_JP.EUC, ja_JP.SJIS, + ja_JP.eucJP, nds_DE + - Remove %ghost entries for /tmp, /tmp is now tmpfs and the files + are handled by systemd since a long time + ------------------------------------------------------------------- Thu Sep 3 00:47:28 UTC 2020 - Stanislav Brabec diff --git a/filesystem.spec b/filesystem.spec index 7317bdd..9d7c09d 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -59,8 +59,14 @@ function create_dir () { mkdir -m $MODE $RPM_BUILD_ROOT/$NAME echo "$XTRA%%dir %%attr($MODE,$OWNR,$GRUP) $NAME" >> filesystem.list case "$NAME" in + /tmp) + echo "q $NAME $MODE $OWNR $GRUP 10d" >> fs-tmp.conf + ;; + /var/tmp) + echo "d $NAME $MODE $OWNR $GRUP -" >> fs-var-tmp.conf + ;; /var/*) - echo "d $NAME $MODE $OWNR -" >> fs-var.conf + echo "d $NAME $MODE $OWNR $GRUP -" >> fs-var.conf ;; esac } @@ -204,7 +210,9 @@ test -n "$NON_EXISTING_DIR" && { echo NON_EXISTING_DIR=$NON_EXISTING_DIR exit 1 } +install -m 0644 fs-tmp.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/fs-tmp.conf install -m 0644 fs-var.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/fs-var.conf +install -m 0644 fs-var-tmp.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/fs-var-tmp.conf %pretrans -p os.remove ("/usr/include/X11") @@ -231,6 +239,8 @@ if posix.stat("/var/lock.rpmsave.tmpx") then end %files -f filesystem.list +/usr/lib/tmpfiles.d/fs-tmp.conf /usr/lib/tmpfiles.d/fs-var.conf +/usr/lib/tmpfiles.d/fs-var-tmp.conf %changelog diff --git a/ghost.list b/ghost.list index 4e2d602..473a0f4 100644 --- a/ghost.list +++ b/ghost.list @@ -1,2 +0,0 @@ -1777 root root /tmp/.X11-unix -1777 root root /tmp/.ICE-unix diff --git a/languages b/languages index 243eab6..4cd4811 100644 --- a/languages +++ b/languages @@ -19,7 +19,6 @@ dz el el_GR en -en@IPA en@boldquot en@quot en@shaw @@ -68,12 +67,8 @@ ia id is it -it_CH it_IT ja -ja_JP.EUC -ja_JP.SJIS -ja_JP.eucJP kk km kn @@ -87,7 +82,6 @@ mr nb nb_NO nds -nds_DE ne nl nl_BE