Changeset 3ac3ae1

Timestamp:

07/06/2020 05:38:54 AM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

89bcb1b

Parents:

5dd7bff

Message:

Change numberings of scriptlets:

• major number can be on 4 digits, so use it in packInstall
• minor number (for package manager) can be greater than 10
  • code on 2 digits
  • change various files accordingly

Files:

• LFS/lfs.xsl (modified) (1 diff)
• common/libs/func_wrt_Makefile (modified) (1 diff)
• pkgmngt/packInstall.sh.dpkg (modified) (1 diff)
• pkgmngt/packInstall.sh.pacman (modified) (3 diffs)
• pkgmngt/packInstall.sh.porg (modified) (1 diff)
• pkgmngt/packInstall.sh.template (modified) (1 diff)

LFS/lfs.xsl

@@ -369 +369 @@
     <xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/>
     <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
+    <xsl:variable name="pos">
+      <xsl:if test="string-length(position()) = 1">
+        <xsl:text>0</xsl:text>
+      </xsl:if>
+      <xsl:value-of select="position()"/>
+    </xsl:variable>
      <!-- Creating dirs and files -->
     <xsl:if test="count(descendant::screen/userinput) &gt; 0 and
                   count(descendant::screen/userinput) &gt;
                       count(descendant::screen[@role='nodump'])">
-      <exsl:document href="{$dirname}/{$order}-{position()}-{$filename}"
+      <exsl:document href="{$dirname}/{$order}-{$pos}-{$filename}"
                      method="text">
         <xsl:text>#!/bin/bash

common/libs/func_wrt_Makefile

@@ -65 +65 @@
 get_package_tarball_name() {       #
 #----------------------------------#
-  local script_name=`echo ${1} | sed -e 's@^[0-9]\{1\}-@@'`
+  local script_name=`echo ${1} | sed -e 's@^[0-9]\{2\}-@@'`
 
    # The use of 'head' is necessary to limit the return value to the FIRST match..

pkgmngt/packInstall.sh.dpkg

@@ -8 +8 @@
 local TGTPKG=$(basename $PKG_DEST)
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
-           sed 's/^[0-9]\{1\}-//')
+           sed 's/^[0-9]\{2\}-//')
 case $PCKGVRS in
   expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;;

pkgmngt/packInstall.sh.pacman

@@ -9 +9 @@
 local PCKGVRS=$(basename $PKGDIR)
 local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
-           sed 's/^[0-9]\{1\}-//')
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
+           sed 's/^[0-9]\{2\}-//')
 # version is only accessible from PKGDIR name. Since the format of the
 # name is not normalized, several hacks are necessary...
@@ -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
 mv * ../$PACKAGE/src
+chown -R tester $PKG_DEST
+chmod -R o+r ../$PACKAGE
 
 cat > PKGBUILD <<EOF
@@ -44 +48 @@
 
 package() {
-mv * \$pkgdir
+cp -a * \$pkgdir
 }
 EOF
 # Building the binary package
-makepkg --asroot -c --skipinteg
+su tester -c"PATH=$PATH; makepkg -c --skipinteg" || true
 # Installing it on LFS
-if ! pacman -U --noconfirm $ARCHIVE_NAME; then
-     pacman -U --noconfirm --force $ARCHIVE_NAME
+if ! pacman -U --noconfirm /var/lib/packages/$ARCHIVE_NAME; then
+     pacman -U --noconfirm --overwrite '*' /var/lib/packages/$ARCHIVE_NAME
 fi
 popd                         # Since the $PKG_DEST directory is destroyed

pkgmngt/packInstall.sh.porg

@@ -109 +109 @@
 local TGTPKG=$(basename $PKG_DEST)
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
-           sed 's/^[0-9]\{1\}-//')
+           sed 's/^[0-9]\{2\}-//')
 # Porg converts package names to lowercase anyway, so do the conversion
 # ourselves

pkgmngt/packInstall.sh.template

@@ -10 +10 @@
 local TGTPKG=$(basename $PKG_DEST)
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
-           sed 's/^[0-9]\{1\}-//')
+           sed 's/^[0-9]\{2\}-//')
 # version is only accessible from PKGDIR name. Since the format of the
 # name is not normalized, several hacks are necessary...