Changeset 3ac3ae1 for pkgmngt


Ignore:
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
Location:
pkgmngt
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pkgmngt/packInstall.sh.dpkg

    r5dd7bff r3ac3ae1  
    88local TGTPKG=$(basename $PKG_DEST)
    99local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
    10            sed 's/^[0-9]\{1\}-//')
     10           sed 's/^[0-9]\{2\}-//')
    1111case $PCKGVRS in
    1212  expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;;
  • pkgmngt/packInstall.sh.pacman

    r5dd7bff r3ac3ae1  
    99local PCKGVRS=$(basename $PKGDIR)
    1010local TGTPKG=$(basename $PKG_DEST)
    11 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
    12            sed 's/^[0-9]\{1\}-//')
     11local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
     12           sed 's/^[0-9]\{2\}-//')
    1313# version is only accessible from PKGDIR name. Since the format of the
    1414# name is not normalized, several hacks are necessary...
     
    3434# to /sources/$PACKAGE/src.
    3535mkdir -p ../$PACKAGE/src
     36# We'll build as user tester. We need this directory to be owned by that user.
     37chown -R tester ../$PACKAGE
    3638mv * ../$PACKAGE/src
     39chown -R tester $PKG_DEST
     40chmod -R o+r ../$PACKAGE
    3741
    3842cat > PKGBUILD <<EOF
     
    4448
    4549package() {
    46 mv * \$pkgdir
     50cp -a * \$pkgdir
    4751}
    4852EOF
    4953# Building the binary package
    50 makepkg --asroot -c --skipinteg
     54su tester -c"PATH=$PATH; makepkg -c --skipinteg" || true
    5155# Installing it on LFS
    52 if ! pacman -U --noconfirm $ARCHIVE_NAME; then
    53      pacman -U --noconfirm --force $ARCHIVE_NAME
     56if ! pacman -U --noconfirm /var/lib/packages/$ARCHIVE_NAME; then
     57     pacman -U --noconfirm --overwrite '*' /var/lib/packages/$ARCHIVE_NAME
    5458fi
    5559popd                         # Since the $PKG_DEST directory is destroyed
  • pkgmngt/packInstall.sh.porg

    r5dd7bff r3ac3ae1  
    109109local TGTPKG=$(basename $PKG_DEST)
    110110local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
    111            sed 's/^[0-9]\{1\}-//')
     111           sed 's/^[0-9]\{2\}-//')
    112112# Porg converts package names to lowercase anyway, so do the conversion
    113113# ourselves
  • pkgmngt/packInstall.sh.template

    r5dd7bff r3ac3ae1  
    1010local TGTPKG=$(basename $PKG_DEST)
    1111local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
    12            sed 's/^[0-9]\{1\}-//')
     12           sed 's/^[0-9]\{2\}-//')
    1313# version is only accessible from PKGDIR name. Since the format of the
    1414# name is not normalized, several hacks are necessary...
Note: See TracChangeset for help on using the changeset viewer.