Attachment 11452 Details for Bug 26044 – Diff of changes to fix filesystem package

[patch] Diff of changes to fix filesystem package

filesystem.spec.diff (text/plain), 1.54 KB, created by Neal Gompa on 2020-01-11 21:41:34 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Gompa

Created: 2020-01-11 21:41:34 CET

Size: 1.54 KB

patch

obsolete

>Index: filesystem.spec
>===================================================================
>--- filesystem.spec     (revision 1477608)
>+++ filesystem.spec     (working copy)
>@@ -1,6 +1,6 @@
> Name:          filesystem
> Version:       2.1.9
>-Release:       %mkrel 31
>+Release:       %mkrel 32
> Summary:       The basic directory layout for a Linux system
> License:       Public Domain
> Group:         System/Base
>@@ -72,24 +72,25 @@
> --# When our rpm is unpacked by cpio, it will set all permissions and modes later.
> --#
>
>-if posix.stat("/usr") == nil then
>-    posix.mkdir("/usr")
>-end
>-
>-for i,dir in ipairs({"/lib", "/%{_lib}", "/sbin", "/bin"}) do
>-    if posix.stat("/usr"..dir) == nil then
>-        posix.mkdir("/usr"..dir)
>-        if posix.stat(dir, "mode") == nil then
>-            posix.symlink("usr"..dir, dir)
>-        end
>-    end
>-end
>-
>-return 0
>-
>-%post -p <lua>
>+posix.mkdir("/usr")
>+posix.mkdir("/usr/bin")
>+posix.mkdir("/usr/sbin")
>+posix.mkdir("/usr/lib")
>+posix.mkdir("/usr/lib/debug")
>+posix.mkdir("/usr/%{_lib}")
>+posix.symlink("usr/bin", "/bin")
>+posix.symlink("usr/sbin", "/sbin")
>+posix.symlink("usr/lib", "/lib")
>+posix.symlink("usr/bin", "/usr/lib/debug/bin")
>+posix.symlink("usr/lib", "/usr/lib/debug/lib")
>+posix.symlink("usr/%{_lib}", "/usr/lib/debug/%{_lib}")
>+posix.symlink("usr/sbin", "/usr/lib/debug/sbin")
>+posix.symlink("usr/%{_lib}", "/%{_lib}")
>+posix.mkdir("/run")
> posix.symlink("../run", "/var/run")
> posix.symlink("../run/lock", "/var/lock")
>+return 0
>+
>
> %files
> %defattr(0755,root,root)

Index: filesystem.spec
===================================================================
--- filesystem.spec     (revision 1477608)
+++ filesystem.spec     (working copy)
@@ -1,6 +1,6 @@
 Name:          filesystem
 Version:       2.1.9
-Release:       %mkrel 31
+Release:       %mkrel 32
 Summary:       The basic directory layout for a Linux system
 License:       Public Domain
 Group:         System/Base
@@ -72,24 +72,25 @@
 --# When our rpm is unpacked by cpio, it will set all permissions and modes later.
 --#

-if posix.stat("/usr") == nil then
-    posix.mkdir("/usr")
-end
-
-for i,dir in ipairs({"/lib", "/%{_lib}", "/sbin", "/bin"}) do
-    if posix.stat("/usr"..dir) == nil then
-        posix.mkdir("/usr"..dir)
-        if posix.stat(dir, "mode") == nil then
-            posix.symlink("usr"..dir, dir)
-        end
-    end
-end
-
-return 0
-
-%post -p <lua>
+posix.mkdir("/usr")
+posix.mkdir("/usr/bin")
+posix.mkdir("/usr/sbin")
+posix.mkdir("/usr/lib")
+posix.mkdir("/usr/lib/debug")
+posix.mkdir("/usr/%{_lib}")
+posix.symlink("usr/bin", "/bin")
+posix.symlink("usr/sbin", "/sbin")
+posix.symlink("usr/lib", "/lib")
+posix.symlink("usr/bin", "/usr/lib/debug/bin")
+posix.symlink("usr/lib", "/usr/lib/debug/lib")
+posix.symlink("usr/%{_lib}", "/usr/lib/debug/%{_lib}")
+posix.symlink("usr/sbin", "/usr/lib/debug/sbin")
+posix.symlink("usr/%{_lib}", "/%{_lib}")
+posix.mkdir("/run")
 posix.symlink("../run", "/var/run")
 posix.symlink("../run/lock", "/var/lock")
+return 0
+

 %files
 %defattr(0755,root,root)

Actions: View | Diff

Attachments on bug 26044: 11449 | 11452