10.1 systemd blfs updates

This commit is contained in:
K D Hedger
2021-04-25 18:09:48 +01:00
parent 41bda0cd3d
commit a1e82cd3cc
9 changed files with 103 additions and 12 deletions

View File

@ -4,7 +4,7 @@
trap 'echo -e "$0 ${RED}FAILED${NORMAL} at line ${GREEN}${LINENO}${NORMAL}"' ERR
DEPENDS="glib-2.66.7"
DEPENDS="glib-2.66.7 libgcrypt-1.9.2 vala-0.50.3"
if ! lfspkg -B "$DEPENDS";then
exit 100
fi

View File

@ -31,7 +31,7 @@ OPTIONS="--prefix=/usr --enable-readline --with-intl-api --with-system-zlib --wi
checkforoptions
pushd $COMPILEAT 2>/dev/null||true
#extractarchive "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
extractarchive "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
pushd "firefox-${VERSION}"
export SHELL=/bin/bash
. /etc/profile

View File

@ -4,7 +4,7 @@
trap 'echo -e "$0 ${RED}FAILED${NORMAL} at line ${GREEN}${LINENO}${NORMAL}"' ERR
DEPENDS="dbus-1.12.20 glib-2.66.7 libusb-1.0.24 libsecret-0.20.4 libsoup-2.72.0"
DEPENDS="dbus-1.12.20 glib-2.66.7 libusb-1.0.24 libsecret-0.20.4 libsoup-2.72.0 polkit-0.118"
if ! lfspkg -B "$DEPENDS";then
exit 100
fi

View File

@ -87,10 +87,10 @@ dbus
Procps-ng
Util-linux
E2fsprogs
Wget
unzip
GPM
Links"
Wget-1.21.1
unzip-6.0
GPM-1.20.7
Links-2.21"
if ! lfspkg -B "$DEPENDS";then
exit 100

View File

@ -10,13 +10,12 @@ BUILD=${BUILD:-1}
SECTION="XORG"
SUFFIX="LFSPKG"
export XORG_PREFIX="/usr"
export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --mandir=$XORG_PREFIX/share/man --localstatedir=/var --disable-static"
export CHECKETC=0
#export XORG_PREFIX="/usr"
#export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --mandir=$XORG_PREFIX/share/man --localstatedir=/var --disable-static"
#export CHECKETC=0
mkdir -vp ${SOURCEARCHIVES}/${SECTION}||true
#HarfBuzz-2.7.4
DEPENDS="util-macros-1.19.3
proto-2020.1
libXau-1.0.9

View File

@ -221,13 +221,17 @@ menuentry "GNU/Linux, Linux $LFSVERSION" {
}
EOF
##all below here is for LFS9.0 needs updating to 10.1
22)
#Before building the X server now is a good time to quickly boot into your new system and make sure all is OK, you can then reboot back to the host and continue building in the chroot or build in the 'real' system, the choice is yours but this HowTo assumes all building is done in the chroot.
#Build xorg:
cd /LFSPkgBuildScripts/xorg/xorg-meta/
./xorg-meta.LFSBuild install
#Install Xfce4
cd /LFSPkgBuildScripts/xfce/xfce4-meta
./xfce4-meta.LFSBuild install
##all below here is for LFS9.0 needs updating to 10.1
15)
#Install documentation stuff
#Also installs python via dependency

View File

@ -0,0 +1,5 @@
#!/bin/bash -e
#©keithhedger Sat 24 Apr 13:33:18 BST 2021 kdhedger68713@gmail.com
sed -i 's|http://www.linuxfromscratch.org/patches/lfs/10.1/\([[:alnum:]][[:alnum:]]*\)\-\(.*\)|https://www.linuxfromscratch.org/patches/downloads/\1/\1-\2|g' wget-list

View File

@ -0,0 +1,49 @@
#!/bin/bash -e
RED='\e[1;31m'
GREEN='\e[1;32m'
NORMAL='\e[0;0m'
trap 'echo -e "$0 ${RED}FAILED${NORMAL} at line ${GREEN}${LINENO}${NORMAL}"' ERR
LFSVERSION=${LFSVERSION:-"10.1"}
rm wget-list||true
wget "https://www.linuxfromscratch.org/lfs/view/$LFSVERSION/wget-list"
:>"./PkgVersions"
while read
do
case $REPLY in
*html*)
echo "ignoring $REPLY ..."
;;
*.patch)
echo "ignoring $REPLY ..."
;;
*tzdata*)
basename "${REPLY,,}"|sed 's/\([[:alpha:]]*\)\([[:digit:]]*\).*/\1_version=\2/' >> "./PkgVersions"
basename "${REPLY,,}"|sed 's/.*[0-9]\(.\).*/tzdata_minor_rev=\1/' >> "./PkgVersions"
basename "${REPLY,,}"|sed 's/\([[:alpha:]]*\)[[:digit:]]*..\(tar\..*\)*/\1_arctype=\2/' >> "./PkgVersions"
;;
*openssl*)
basename "${REPLY,,}"|sed 's/.\.tar\..*$//'|sed 's/\(.*\)-\(.*\)/\1_version=\2/' >> "./PkgVersions"
echo $REPLY|sed 's|.*\(.\)\.tar.*|openssl_minor_rev=\1|' >> "./PkgVersions"
basename "${REPLY,,}"|sed 's/\(.*\)-.*\(tar\..*\)/\1_arctype=\2/'|tr "-" "_" >> "./PkgVersions"
;;
*expect*)
basename "${REPLY,,}"|sed 's/expect\([0-9.]*\)\.tar\..*/expect_version=\1/' >> "./PkgVersions"
basename "${REPLY,,}"|sed 's/\([[:alpha:]]*\).*\.\(tar\..*\)/\1_arctype=\2/' >> "./PkgVersions"
;;
*tcl*)
basename "${REPLY,,}"|sed 's/tcl\([0-9]*\)/tcl_version=\1/'|sed 's/-src.*//' >> "./PkgVersions"
basename "${REPLY,,}"|sed 's/.*src\.\(tar\..*\)/tcl_arctype=\1/' >> "./PkgVersions"
;;
*)
basename "${REPLY,,}"|sed 's/\.tar\..*$//'|sed 's/\(.*\)-\(.*\)/\1_version=\2/'|tr "-" "_" >> "./PkgVersions"
basename "${REPLY,,}"|sed 's/\(.*\)-.*\(tar\..*\)/\1_arctype=\2/'|tr "-" "_" >> "./PkgVersions"
;;
esac
done < <(cat wget-list)
. $(dirname $0)/RunSeds

34
Updating/UpdatePatches Executable file
View File

@ -0,0 +1,34 @@
#!/bin/bash
#©keithhedger Sun 25 Apr 13:28:15 BST 2021 kdhedger68713@gmail.com
mkdir -vp /tmp/patches
rm /tmp/patches/*
:>/tmp/patches/REJECTS
:>/tmp/patches/OK
cd /mnt/LFS/LFSPkgBuildScripts
while read
do
eval $(grep "PKGNAME=" "$REPLY")||true
eval $(grep "TARNAME=" "$REPLY")||true
eval $(grep "VERSION=" "$REPLY")||true
x=$(grep "^[[:space:]]*gettar.*linuxfromscratch.*\.patch" "$REPLY")
if [ "$x" != "" ];then
y=$(echo ${x/blfs/downloads}|sed -E 's@/\$\{*LFSVERSION\}*/|/10.1/|/7.5/|7.6/|/8.2/|/7.7/@/${PKGNAME}/@;s@http:@https:@')
y="${y//\"}"
y="${y/\$SECTION/}"
final=$(eval echo ${y/gettar/})
pushd /tmp/patches
if ! wget --timeout=1 --waitretry=0 --tries=2 --retry-connrefused "$final";then
echo "NO $REPLY ..."
echo wget $final
echo "$REPLY $final" >> ./REJECTS
else
echo /mnt/LFS/LFSPkgBuildScripts/$REPLY >> ./OK
replace=$(echo ${x/blfs/downloads}|sed -E 's@/\$\{*LFSVERSION\}*/|/10.1/|/7.5/|7.6/|/8.2/|/7.7/@/${PKGNAME}/@;s@http:@https:@')
#sed -n "s@^[[:space:]]*gettar.*linuxfromscratch.*\.patch.*@$replace@p" /mnt/LFS/LFSPkgBuildScripts/$REPLY >> ./OK
sed -i "s@^[[:space:]]*gettar.*linuxfromscratch.*\.patch.*@$replace@p" /mnt/LFS/LFSPkgBuildScripts/$REPLY
fi
popd
fi
done < <(find -iname "*.LFSBuild")