Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package filesystem for openSUSE:Factory
checked in at 2021-03-02 12:26:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/filesystem (Old)
and /work/SRC/openSUSE:Factory/.filesystem.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "filesystem"
Tue Mar 2 12:26:02 2021 rev:155 rq:875129 version:MACRO
Changes:
--------
--- /work/SRC/openSUSE:Factory/filesystem/filesystem.changes 2021-02-22
14:22:03.631531883 +0100
+++ /work/SRC/openSUSE:Factory/.filesystem.new.2378/filesystem.changes
2021-03-02 12:27:21.415419243 +0100
@@ -6,0 +7,8 @@
+Mon Feb 8 17:36:52 UTC 2021 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961):
+ * Decide at build time whether file lists for usrmerge or legacy
+ should be created.
+ * convert file system in %pre if needed
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ filesystem.spec ++++++
--- /var/tmp/diff_new_pack.mVmnX0/_old 2021-03-02 12:27:22.131419884 +0100
+++ /var/tmp/diff_new_pack.mVmnX0/_new 2021-03-02 12:27:22.135419887 +0100
@@ -16,6 +16,8 @@
#
+%define nvr %{name}-%{version}-%{release}
+
Name: filesystem
Summary: Basic Directory Layout
License: MIT
@@ -23,6 +25,10 @@
Version: %(echo %suse_version | cut -b-2).%(echo %suse_version | cut
-b3)
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?usrmerged}
+# XXX libsolv never sees the rpmlib provides fulfilled
+Requires(pre): (compat-usrmerge-tools or rpmlib(X-CheckUnifiedSystemdir))
+%endif
Requires: group(root)
Requires: user(root)
URL:
https://build.opensuse.org/package/show/openSUSE:Factory/filesystem
@@ -40,6 +46,8 @@
%prep
%setup -c -n filesystem -T
+cp %{SOURCE0} .
+cp %{SOURCE1} .
%build
@@ -73,22 +81,38 @@
mkdir -p $RPM_BUILD_ROOT
# generic directories first
echo "%%defattr(-,root,root)" > filesystem.list
-{
- cat %{SOURCE0}
%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64
- cat %{SOURCE64}
+cat %{SOURCE64} >> directory.list
+%endif
+%if 0%{?usrmerged}
+cat >> filesystem.links << EOF
+usr/bin /bin
+usr/sbin /sbin
+usr/lib /lib
+%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64
+usr/lib64 /lib64
+%endif
+EOF
+%else
+cat >> directory.list << EOF
+0755 root root /bin
+0755 root root /lib
+0755 root root /sbin
+%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64
+0755 root root /lib64
+%endif
+EOF
%endif
-} | while read MOD OWN GRP NAME ; do
+cat >> directory.list <<EOF
+0755 root root %{?usrmerged:/usr}/lib/modules
+0755 root root %{_firmwaredir}
+EOF
+while read MOD OWN GRP NAME ; do
create_dir $MOD $OWN $GRP $NAME
-done
+done < directory.list
# ghost files next
cat %{SOURCE3} | while read MOD OWN GRP NAME ; do
-%ifarch s390 s390x
- case $NAME in
- /media/floppy|/media/cdrom) continue ;;
- esac
-%endif
- create_dir $MOD $OWN $GRP $NAME "%%verify(not mode) %%ghost "
+ create_dir $MOD $OWN $GRP $NAME "%%ghost "
done
# arch specific leftovers
for march in \
@@ -149,7 +173,7 @@
esac
;;
esac
-done < %{SOURCE1}
+done < filesystem.links
# Create the locale directories:
while read LANG ; do
create_dir 0755 root root /usr/share/locale/$LANG/LC_MESSAGES
@@ -237,6 +261,26 @@
os.execute("mv /var/lock.rpmsave.tmpx/* /var/lock")
os.remove("/var/lock.rpmsave.tmpx")
end
+%if 0%{?usrmerged}
+needmigrate = false
+local dirs = {"/bin",
+ "/sbin",
+%ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64
+ "/lib64",
+%endif
+ "/lib" }
+for i in pairs(dirs) do
+ local t = posix.stat(dirs[i], "type")
+ if t == nil then
+ posix.symlink("usr"..dirs[i], dirs[i])
+ elseif t == "directory" then
+ needmigrate = true
+ end
+end
+if needmigrate then
+ assert(os.execute("/usr/libexec/convertfs"))
+end
+%endif
posix.mkdir("/proc")
posix.chmod("/proc", 0555)
posix.mkdir("/sys")
++++++ directory.list ++++++
--- /var/tmp/diff_new_pack.mVmnX0/_old 2021-03-02 12:27:22.175419923 +0100
+++ /var/tmp/diff_new_pack.mVmnX0/_new 2021-03-02 12:27:22.179419927 +0100
@@ -1,4 +1,3 @@
-0755 root root /bin
0755 root root /boot
0755 root root /dev
0755 root root /etc
@@ -24,16 +23,12 @@
0755 root root /etc/xdg
0755 root root /etc/xdg/autostart
0755 root root /home
-0755 root root /lib
-0755 root root /lib/modules
-0755 root root /lib/firmware
0755 root root /mnt
0755 root root /opt
0700 root root /root
0700 root root /root/.gnupg
0755 root root /root/bin
0755 root root /run
-0755 root root /sbin
0755 root root /srv/www
0755 root root /srv/www/cgi-bin
0755 root root /srv/www/htdocs
++++++ directory.list64 ++++++
--- /var/tmp/diff_new_pack.mVmnX0/_old 2021-03-02 12:27:22.195419941 +0100
+++ /var/tmp/diff_new_pack.mVmnX0/_new 2021-03-02 12:27:22.195419941 +0100
@@ -1,4 +1,3 @@
-0755 root root /lib64
0755 root root /usr/lib64
0755 root root /usr/lib64/pkgconfig
0755 root root /usr/lib64/browser-plugins
++++++ filesystem.links ++++++
--- /var/tmp/diff_new_pack.mVmnX0/_old 2021-03-02 12:27:22.211419955 +0100
+++ /var/tmp/diff_new_pack.mVmnX0/_new 2021-03-02 12:27:22.211419955 +0100
@@ -3,4 +3,3 @@
spool/mail /var/mail
# systemd
../run /var/run
-
