Author: pierre
Date: Tue Jul 7 08:27:54 2020
New Revision: 4190
Log:
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.
Modified:
jhalfs/trunk/LFS/lfs.xsl
jhalfs/trunk/pkgmngt/packInstall.sh.pacman
jhalfs/trunk/pkgmngt/packageManager.xml.pacman
Modified: jhalfs/trunk/LFS/lfs.xsl
==============================================================================
--- jhalfs/trunk/LFS/lfs.xsl Mon Jul 6 02:38:47 2020 (r4189)
+++ jhalfs/trunk/LFS/lfs.xsl Tue Jul 7 08:27:54 2020 (r4190)
@@ -172,9 +172,7 @@
]//userinput"
mode="pkgmngt"/>
</xsl:if>
- <xsl:if test="contains(@id,'createfiles')
- and $pkgmngt='y'
- and $bashdir='/tools'">
+ <xsl:if test="contains(@id,'createfiles') and $pkgmngt='y'">
<xsl:apply-templates
select="document('packageManager.xml')//sect1[
@id='ch-pkgmngt-createfiles'
Modified: jhalfs/trunk/pkgmngt/packInstall.sh.pacman
==============================================================================
--- jhalfs/trunk/pkgmngt/packInstall.sh.pacman Mon Jul 6 02:38:47 2020
(r4189)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.pacman Tue Jul 7 08:27:54 2020
(r4190)
@@ -33,10 +33,10 @@
# Right now, we have the files in the current directory. They should be moved
# 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
cat > PKGBUILD <<EOF
@@ -51,7 +51,7 @@
}
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
pacman -U --noconfirm --overwrite '*' /var/lib/packages/$ARCHIVE_NAME
Modified: jhalfs/trunk/pkgmngt/packageManager.xml.pacman
==============================================================================
--- jhalfs/trunk/pkgmngt/packageManager.xml.pacman Mon Jul 6 02:38:47
2020 (r4189)
+++ jhalfs/trunk/pkgmngt/packageManager.xml.pacman Tue Jul 7 08:27:54
2020 (r4190)
@@ -497,8 +497,7 @@
LogFile = /var/log/pacman.log
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>
@@ -550,11 +549,17 @@
<title>Creating Essential Files</title>
<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>
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
