Changeset 3484658 for pkgmngt

Timestamp:

07/07/2020 03:27:54 PM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

ee842e2

Parents:

b6e981a

Message:

Various fixes for recent pacman with new book

• add createfiles instructions of packageManager.xml for new book too
• remove unneeded chown when installing pacman (not needed thanks to the above)
• Use a dedicated user "builder" for running makepkg: user "tester" is removed at the end of chapter 8, but is needed in following chapters.

Location:

pkgmngt

Files:

• packInstall.sh.pacman (modified) (2 diffs)
• packageManager.xml.pacman (modified) (2 diffs)

pkgmngt/packInstall.sh.pacman

@@ -34 +34 @@
 # to /sources/$PACKAGE/src.
 mkdir -p ../$PACKAGE/src
-# We'll build as user tester. We need this directory to be owned by that user.
-chown -R tester ../$PACKAGE
+# We'll build as user builder. We need this directory to be owned by that user.
+chown -R builder ../$PACKAGE
 mv * ../$PACKAGE/src
-chown -R tester $PKG_DEST
+chown -R builder $PKG_DEST
 chmod -R o+r ../$PACKAGE
 
@@ -52 +52 @@
 EOF
 # Building the binary package
-su tester -c"PATH=$PATH; makepkg -c --skipinteg" || true
+su builder -c"PATH=$PATH; makepkg -c --skipinteg" || true
 # Installing it on LFS
 if ! pacman -U --noconfirm /var/lib/packages/$ARCHIVE_NAME; then

pkgmngt/packageManager.xml.pacman

@@ -498 +498 @@
 SigLevel = Never
 # Repository: do not add one now: repo-add needs openssl.
-EOF
-chown tester:tester /var/lib/{packages,pacman}</userinput></screen>
+EOF</userinput></screen>
 
   </sect2>
@@ -551 +550 @@
 
 <screen><userinput>if ! grep -q tester /etc/passwd; then
-    echo "tester:x:101:101::/home/tester:/bin/bash" >> /etc/passwd
-    echo "tester:x:101:" >> /etc/group
-    install -o tester -d /home/tester
+    echo "builder:x:101:101::/home/builder:/bin/bash" >> /etc/passwd
+    echo "builder:x:101:" >> /etc/group
+    install -o builder -d /home/builder
+else
+    TEST_UID=$(grep tester /etc/passwd | cut -d: -f3)
+    TEST_GID=$(grep tester /etc/group | cut -d: -f3)
+    echo "builder:x:$((TEST_UID+1)):$((TEST_GID+1))::/home/builder:/bin/bash" >> /etc/passwd
+    echo "builder:x:$((TEST_GID+1)):" >> /etc/group
+    install -o builder -d /home/builder
 fi
-chown tester:tester /var/lib/{packages,pacman}</userinput></screen>
+chown builder:builder /var/lib/{packages,pacman}</userinput></screen>
 
 </sect1>