Accepting request 1240741 from Base:System

- add Provides: may-perform-usrmerge (bsc#1236481) 

- Add support for loongarch64

- Remove /usr/etc/skel/bin/

OBS-URL: https://build.opensuse.org/request/show/1240741
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/filesystem?expand=0&rev=175

directory.list

@@ -29,7 +29,6 @@
 0755 root root /usr/etc/profile.d
 0755 root root /usr/etc/logrotate.d
 0755 root root /usr/etc/skel
-0755 root root /usr/etc/skel/bin
 0700 root root /usr/etc/skel/.cache
 0700 root root /usr/etc/skel/.config
 0700 root root /usr/etc/skel/.local

filesystem.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Tue Jan 28 10:26:57 CET 2025 - ro@suse.de
+
+- add Provides: may-perform-usrmerge (bsc#1236481) 
+
+-------------------------------------------------------------------
+Mon Jan 27 08:13:06 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Add support for loongarch64
+
+-------------------------------------------------------------------
+Sun Dec 29 18:21:25 UTC 2024 - Heitor Moreira da Silva <heitor@opensuse.org>
+
+- Remove /usr/etc/skel/bin/
+
+-------------------------------------------------------------------
+Fri Dec 27 12:59:34 UTC 2024 - Martin Hauke <mardnh@gmx.de>
+
+- Add /usr/$march directories for HPPA. Will be packaging both
+  hppa-suse-linux and hppa64-suse-linux because the compiler
+  suite is usually configured with the latter on this arch.
+
+-------------------------------------------------------------------
+Wed Sep 25 19:10:06 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
+
+- Move /srv/www hierachy to the packages which use them
+  [bsc#1231027]
+
 -------------------------------------------------------------------
 Fri Dec  8 10:29:23 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
 

filesystem.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package filesystem
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,6 +33,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(pre):  compat-usrmerge-tools
 Requires:       group(root)
 Requires:       user(root)
+Provides:       may-perform-usrmerge
 URL:            https://build.opensuse.org/package/show/openSUSE:Factory/filesystem
 Source0:        directory.list
 Source1:        filesystem.links
@@ -53,7 +54,7 @@ the home directories of system users.
 cp %{SOURCE0} .
 cp %{SOURCE1} .
 cp %{SOURCE3} .
-%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64
+%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64 loongarch64
 cat %{SOURCE66} >> ghost.list
 %endif
 
@@ -123,7 +124,7 @@ cat > pre.lua <<'EOF'
 needmigrate = false
 local dirs = {"/bin",
   "/sbin",
-%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64
+%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64 loongarch64 hppa64
   "/lib64",
 %endif
   "/lib" }
@@ -191,7 +192,7 @@ function create_dir () {
 mkdir -p $RPM_BUILD_ROOT
 # generic directories first
 echo "%%defattr(-,root,root)" > filesystem.list
-%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64
+%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64 loongarch64
 cat %{SOURCE64} >> directory.list
 %endif
 %ifarch x86_64 %x86_64
@@ -201,7 +202,7 @@ cat >> filesystem.links << EOF
 usr/bin   /bin
 usr/sbin  /sbin
 usr/lib   /lib
-%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64
+%ifarch s390x %sparc x86_64 %x86_64 ppc64 ppc aarch64 ppc64le riscv64 loongarch64 hppa64
 usr/lib64 /lib64
 %endif
 EOF
@@ -233,6 +234,12 @@ powerpc64-suse-linux \
 %ifarch ppc64le
 powerpc64le-suse-linux \
 %else
+%ifarch hppa
+hppa-suse-linux \
+%else
+%ifarch hppa64
+hppa64-suse-linux \
+%else
 %ifarch %arm
 %{_target_cpu}-suse-linux-gnueabi \
 %else
@@ -242,6 +249,8 @@ powerpc64le-suse-linux \
 %endif
 %endif
 %endif
+%endif
+%endif
 %endif
   ; do
   create_dir 0755 root root /usr/$march

ghost.list

@@ -4,9 +4,6 @@
 0555 root root /opt
 0555 root root /proc
 0555 root root /srv
-0755 root root /srv/www
-0755 root root /srv/www/cgi-bin
-0755 root root /srv/www/htdocs
 0755 root root /run/lock
 0555 root root /sys
 0755 root root /usr/local