Changeset 55e82d2 for pkgmngt


Ignore:
Timestamp:
06/12/2022 08:54:14 PM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
ablfs-more, trunk
Children:
ff30640
Parents:
84d0d39
Message:

Various updates for pacman PM

  • update versions and instructions in packageManager.xml.pacman. Also remove the pages for old books.
  • Fix packInstall.sh.pacman, so that restarting after a failure is possible
  • Change LFS/lfs.xsl so that destdir install use symlinks for /lib, /sbin, and /bin. Remove also absolete commands for old books
  • fix gcc script in book parser
Location:
pkgmngt
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pkgmngt/packInstall.sh.pacman

    r84d0d39 r55e82d2  
    3131                             # on the system
    3232# Right now, we have the files in the current directory. They should be moved
    33 # to /sources/$PACKAGE/src.
    34 mkdir -p ../$PACKAGE/src
     33# to /sources/$PACKAGE/src. Also, in case there was a failure before, clean
     34# /sources/$PACKAGE
     35rm -rf /sources/$PACKAGE
     36mkdir -p /sources/$PACKAGE/src
     37
    3538# We'll build as user builder. We need this directory to be owned by that user.
    36 chown -R builder ../$PACKAGE
    37 mv * ../$PACKAGE/src
     39chown -R builder /sources/$PACKAGE
     40mv * /sources/$PACKAGE/src
    3841chown -R builder $PKG_DEST
    39 chmod -R o+r ../$PACKAGE
     42chmod -R o+r /sources/$PACKAGE
    4043
    4144cat > PKGBUILD <<EOF

  • pkgmngt/packageManager.xml.pacman

    r84d0d39 r55e82d2  
    1010<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    1111  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    12 <!ENTITY libarchive-version "3.4.3">
    13 <!ENTITY curl-version       "7.71.1">
    14 <!ENTITY fakeroot-version   "1.24">
    15 <!ENTITY pacman-version     "5.2.2">
     12<!ENTITY libarchive-version "3.6.1">
     13<!ENTITY curl-version       "7.83.1">
     14<!ENTITY fakeroot-version   "1.29">
     15<!ENTITY pacman-version     "6.0.1">
    1616<!ENTITY libarchive-url "https://github.com/libarchive/libarchive/releases/download/v&libarchive-version;/libarchive-&libarchive-version;.tar.xz">
    17 <!ENTITY curl-url       "https://curl.haxx.se/download/curl-&curl-version;.tar.xz">
     17<!ENTITY curl-url       "https://curl.se/download/curl-&curl-version;.tar.xz">
    1818<!ENTITY fakeroot-url   "http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_&fakeroot-version;.orig.tar.gz">
    19 <!ENTITY pacman-url     "https://sources.archlinux.org/other/pacman/pacman-&pacman-version;.tar.gz">
    20 <!ENTITY curl-md5       "b54b386057846ce3edd3584b19741569">
    21 <!ENTITY libarchive-md5 "4b216ea3015ecf8ae555a2026f9a6b73">
    22 <!ENTITY fakeroot-md5   "964e5f438f1951e5a515dd54edd50fa6">
    23 <!ENTITY pacman-md5     "3a9b078a83996a3272844807b91959c6">
     19<!ENTITY pacman-url     "https://sources.archlinux.org/other/pacman/pacman-&pacman-version;.tar.xz">
     20<!ENTITY curl-md5       "08c6d9c25d9cf8d17be28363753e42ca">
     21<!ENTITY libarchive-md5 "9465f7995649c9ea84854a7fd8c76f30">
     22<!ENTITY fakeroot-md5   "cab9604a7dc1d58346e0d15bb285bd0f">
     23<!ENTITY pacman-md5     "f71e6f06867749735960d0c1d199d375">
    2424<!ENTITY % general-entities SYSTEM "BOOK/general.ent">
    2525%general-entities;
    … …  
    5555-->
    5656
    57 <!-- Do not change the next line. The name of the scriptlet will be taken
    58 from the dbhtml instruction: it is the name of the file less .html, with
    59 xxx-x-added before (x, digits).-->
    60 <sect1 id="ch-tools-libarchive" role="wrap">
    61   <?dbhtml filename="libarchive.html"?>
    62 
    63   <sect1info condition="script">
    64     <productname>libarchive</productname>
    65     <productnumber>&libarchive-version;</productnumber>
    66     <address>&libarchive-url;</address>
    67   </sect1info>
    68 
    69   <title>Libarchive-&libarchive-version;</title>
    70 
    71   <sect2 role="installation">
    72     <title/>
    73 <screen><userinput remap="configure">./configure --prefix=/tools \
    74             --without-bz2lib \
    75             --without-xml2   \
    76             --enable-bsdtar=static \
    77             --enable-bsdcpio=static</userinput></screen>
    78 <screen><userinput remap="make">make</userinput></screen>
    79 <screen><userinput remap="install">make install</userinput></screen>
    80   </sect2>
    81 
    82 </sect1>
    83 
    84 <sect1 id="ch-tools-openssl" role="wrap">
    85   <?dbhtml filename="openssl.html"?>
    86 
    87   <sect1info condition="script">
    88     <productname>openssl</productname>
    89     <productnumber>&openssl-version;</productnumber>
    90     <address>&openssl-url;</address>
    91   </sect1info>
    92 
    93   <title>openssl-&openssl-version;</title>
    94 
    95   <sect2 role="installation">
    96     <title/>
    97 <screen><userinput remap="configure">./config --prefix=/tools            \
    98          --openssldir=/tools/etc/ssl \
    99          --libdir=lib</userinput></screen>
    100 <screen><userinput remap="make">make</userinput></screen>
    101 <screen><userinput remap="install">make install</userinput></screen>
    102   </sect2>
    103 
    104 </sect1>
    105 
    106 <sect1 id="ch-tools-curl" role="wrap">
    107   <?dbhtml filename="curl.html"?>
    108 
    109   <sect1info condition="script">
    110     <productname>curl</productname>
    111     <productnumber>&curl-version;</productnumber>
    112     <address>&curl-url;</address>
    113   </sect1info>
    114 
    115   <title>Curl-&curl-version;</title>
    116 
    117   <sect2 role="installation">
    118     <title/>
    119 <screen><userinput remap="configure">./configure --prefix=/tools \
    120             --disable-static</userinput></screen>
    121 <screen><userinput remap="make">make</userinput></screen>
    122 <screen><userinput remap="install">make install</userinput></screen>
    123   </sect2>
    124 
    125 </sect1>
    126 
    127 <sect1 id="ch-tools-libcap" role="wrap">
    128   <?dbhtml filename="libcap.html"?>
    129 
    130   <sect1info condition="script">
    131     <productname>libcap</productname>
    132     <productnumber>&libcap-version;</productnumber>
    133     <address>&libcap-url;</address>
    134   </sect1info>
    135 
    136   <title>libcap-&libcap-version;</title>
    137 
    138   <sect2 role="installation">
    139     <title/>
    140 <screen><userinput remap="make">make lib=lib prefix=/tools GOLANG=no PAM_CAP=no</userinput></screen>
    141 <screen><userinput remap="install">make lib=lib prefix=/tools GOLANG=no PAM_CAP=no install</userinput></screen>
    142   </sect2>
    143 
    144 </sect1>
    145 
    146 <sect1 id="ch-tools-fakeroot" role="wrap">
    147   <?dbhtml filename="fakeroot.html"?>
    148 
    149   <sect1info condition="script">
    150     <productname>fakeroot</productname>
    151     <productnumber>&fakeroot-version;</productnumber>
    152     <address>&fakeroot-url;</address>
    153   </sect1info>
    154 
    155   <title>fakeroot-&fakeroot-version;</title>
    156 
    157   <sect2 role="installation">
    158     <title/>
    159 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
    160 <screen><userinput remap="make">make</userinput></screen>
    161 <screen><userinput remap="install">make install</userinput></screen>
    162   </sect2>
    163 
    164 </sect1>
    165 
    166 <sect1 id="ch-tools-pkgmngt" role="wrap">
    167   <?dbhtml filename="pacman.html"?>
    168 
    169   <sect1info condition="script">
    170     <productname>pacman</productname>
    171     <productnumber>&pacman-version;</productnumber>
    172     <address>&pacman-url;</address>
    173   </sect1info>
    174 
    175   <title>Pacman-&pacman-version;</title>
    176 
    177   <sect2 role="installation">
    178     <title/>
    179 <!-- You can use any number of remap="pre", "configure", "make", "test", "install"
    180 <screen><userinput remap="something">Instructions</userinput></screen>.
    181 They are executed in that order. "pre" can be used for patching for example.
    182 In case testing is enabled, the instructions flagged test are logged to a different
    183 file (test-log). If testing is not enabled, they are not executed at all. Do not
    184 put line breaks before and after your instructions. <userinput> without
    185 remap attribute are considered configuration instructions and executed last. You
    186 can also use remap="adjust" for the same purpose. -->
    187 <screen><userinput remap="configure">mkdir build
    188 cd build
    189 meson --prefix=/tools                        \
    190       --sysconfdir=/tools/etc                \
    191       --localstatedir=/tools/var             \
    192       -Dcrypto=openssl                       \
    193       -Ddoc=disabled                         \
    194       -Dgpgme=disabled                       \
    195       -Dpkg_config_path=/tools/lib/pkgconfig</userinput></screen>
    196 
    197 <screen><userinput remap="make">ninja</userinput></screen>
    198 
    199 <screen><userinput remap="install">ninja install</userinput></screen>
    200 
    201 <screen><userinput>sed -e 's@/usr@/tools@g' \
    202     -e 's/\([^!]\)strip/\1!strip/' \
    203     -e 's/\([^!]\)libtool/\1!libtool/' \
    204     -e 's/\([^!]\)zipman/\1!zipman/' \
    205     -i /tools/etc/makepkg.conf
    206 cat &gt;&gt; /tools/etc/makepkg.conf &lt;&lt; EOF
    207 BUILDDIR=/sources
    208 PKGDEST=/var/lib/packages
    209 PACKAGER="Pierre Labastie &lt;lnimbus@club-internet.fr&gt;"
    210 EOF
    211 cat &gt;&gt; /tools/etc/pacman.conf &lt;&lt; EOF
    212 DBPath   = /var/lib/pacman/
    213 CacheDir = /var/cache/pacman/pkg/
    214 LogFile  = /var/log/pacman.log
    215 SigLevel = Never
    216 # Repository: do not add one now: repo-add needs openssl.
    217 EOF</userinput></screen>
    218 
    219   </sect2>
    220 
    221 </sect1>
    222 
    223 <!-- version for new book: needs ninja and meson, which needs
     57<!-- pacman now needs ninja and meson, which needs
    22458     Python rebuilt with libffi and zlib. Needs also pkg-config -->
    22559<sect1 id="ch-chroot-libarchive" role="wrap">
    … …  
    285119    <title/>
    286120<screen><userinput remap="configure">./configure --prefix=/usr \
    287             --disable-static</userinput></screen>
     121    --disable-static \
     122    --with-openssl</userinput></screen>
    288123<screen><userinput remap="make">make</userinput></screen>
    289124<screen><userinput remap="install">make install</userinput></screen>
    … …  
    305140  <sect2 role="installation">
    306141    <title/>
    307 <screen><userinput remap="pre">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
    308 <screen><userinput remap="make">make lib=lib</userinput></screen>
    309 <screen><userinput remap="install">make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install
    310 chmod -v 755 /lib/libcap.so.&libcap-version;
    311 mv -v /lib/libpsx.a /usr/lib
    312 rm -v /lib/libcap.so
    313 ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
     142<screen><userinput remap="pre">sed -i '/install -m.*STA/d' libcap/Makefile</userinput></screen>
     143<screen><userinput remap="make">make prefix=/usr lib=lib</userinput></screen>
     144<screen><userinput remap="install">make lib=lib prefix=/usr install</userinput></screen>
    314145  </sect2>
    315146
    … …  
    352183<screen><userinput remap="make">make</userinput></screen>
    353184<screen><userinput remap="install">make install
    354 mv -v /usr/lib/libz.so.* /lib
    355 ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
     185rm -fv /usr/lib/libz.a</userinput></screen>
    356186  </sect2>
    357187
    … …  
    371201  <sect2 role="installation">
    372202    <title/>
    373 <screen><userinput remap="configure">./configure --prefix=/usr --disable-static --with-gcc-arch=native</userinput></screen>
     203<screen><userinput remap="configure">./configure --prefix=/usr --disable-static --with-gcc-arch=native --disable-exec-static-tramp</userinput></screen>
    374204<screen><userinput remap="make">make</userinput></screen>
    375205<screen><userinput remap="install">make install</userinput></screen>
    … …  
    523353sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \
    524354    -e 's:/var/spool/mail:/var/mail:'                 \
    525     -i etc/login.defs
    526 sed -i 's/1000/999/' etc/useradd</userinput></screen>
     355    -e '/PATH=/{s@/sbin:@@;s@/bin:@@}'                \
     356    -i etc/login.defs</userinput></screen>
    527357<screen><userinput remap="configure">touch /usr/bin/passwd
    528 ./configure --sysconfdir=/etc \
     358./configure --sysconfdir=/etc --disable-static \
    529359            --with-group-name-max-length=32</userinput></screen>
    530360<screen><userinput remap="make">make</userinput></screen>
    … …  
    605435    <title/>
    606436<screen><userinput remap="configure">./configure --prefix=/usr \
    607             --disable-static \
    608             --enable-threaded-resolver</userinput></screen>
     437            --disable-static --with-openssl \
     438            --enable-threaded-resolver \
     439            --with-ca-path=/etc/ssl/certs</userinput></screen>
    609440<screen><userinput remap="make">make</userinput></screen>
    610441<screen><userinput remap="install">make DESTDIR=$PKG_DEST install
     442rm -rf docs/examples/.deps
    611443find docs \( -name "Makefile*" -o -name "*.1" -o -name "*.3" \) -exec rm {} \;
    612444install -v -d -m755 $PKG_DEST/usr/share/doc/curl-&curl-version;
Note: See TracChangeset for help on using the changeset viewer.