voncloft · kizeren · Apr 6, 2021 · Apr 28, 2021 · Apr 28, 2021 · Apr 28, 2021
diff --git a/02-base b/02-base
@@ -1,5 +1,6 @@
 #!/bin/bash
-
+### before starting the build decide whether you want sysvinit or systemd
+LFS=/mnt/lfs
 lfs_dirs() {
 	mkdir -pv $LFS/dev
 	mknod -m 600 $LFS/dev/console c 5 1 || true
@@ -148,14 +149,16 @@ if [ -x $LFS/usr/bin/env ]; then
 else
 	ENVLFS=/tools/bin/env
 fi
-
+###add back into below for efi
+#wget pkgutils libnl dbus libxml2 dhcpcd wpa_supplicant lzo lz4 squashfs-tools popt efivar pciutils efibootmgr libpng which freetype2 dosfstools grub-efi
+###remember mbr = msdos gpt=efi
 PKGS="filesystem linux-api-headers man-pages glibc tzdata zlib bzip2 file readline m4 bc binutils gmp mpfr mpc attr acl shadow gcc
 	pkg-config ncurses libcap sed psmisc iana-etc bison flex grep bash libtool gdbm gperf expat inetutils
-	perl perl-xml-parser intltool autoconf automake xz kmod gettext elfutils libffi openssl python3 coreutils
-	diffutils gawk findutils groff fuse2 grub less gzip iproute2 kbd libpipeline make patch man-db tar texinfo vim procps-ng
-	util-linux e2fsprogs sysklogd sysvinit eudev lfs-bootscripts linux-firmware libarchive mkinitramfs linux libtasn1 p11-kit ca-certificates 
-	wget pkgutils libnl dbus libxml2 dhcpcd wpa_supplicant lzo lz4 squashfs-tools popt efivar pciutils efibootmgr libpng which freetype2 dosfstools grub-efi
-	curl ports httpup gpm libevent links mtools syslinux"
+	xz tar libarchive perl perl-xml-parser intltool autoconf automake kmod gettext elfutils libffi openssl python3 coreutils
+	diffutils gawk findutils groff fuse2 grub less gzip iproute2 kbd libpipeline make patch man-db texinfo procps-ng
+	util-linux e2fsprogs sysklogd sysvinit eudev lfs-bootscripts linux-firmware mkinitramfs libtasn1 p11-kit ca-certificates 
+	wget pkgutils libnl dbus libxml2 dhcpcd wpa_supplicant lzo lz4 squashfs-tools popt pciutils libpng which freetype2 dosfstools
+	curl ports httpup gpm libevent links mtools syslinux nano git scratchpkg finalize"
 
 if [ ! -f $LFS/var/lib/pkg/db ]; then
 	lfs_dirs
@@ -168,7 +171,7 @@ cp -Ra ports/* $LFS/usr/ports/
 
 for pkg in $PKGS; do
 	case $pkg in
-		filesystem|gcc|bash|perl|coreutils) runinchroot pkgin -i -ic $pkg || die;;
+		filesystem|gcc|bash|perl|coreutils|scratchpkg) runinchroot pkgin -i -ic $pkg || die;;
 		*) runinchroot pkgin -i $pkg || die;;
 	esac
 done

diff --git a/README.md b/README.md
@@ -8,7 +8,16 @@ This repo contain scripts to automate multilib LFS build + livecd. This LFS buil
 * wget
 * passes lfs version-check.sh test
 * squashfs-tools & libisoburn (optional to create the livecd iso)
-
+* g++
+* texinfo
+* pkg-config
+* m4
+* gcc-multilib
+* g++-multilib
+- libarchive-dev
+### Partition Notes
+* MBR = BIOS
+* GPT = EUFI (EWWWWW FI - I haaaaaate EUFI)
 ### Scripts
 
 * 01-toolchain

diff --git a/pkg/.placeholder b/pkg/.placeholder
diff --git a/ports/core/acl/Pkgfile b/ports/core/acl/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=acl
-version=2.2.53
+version=2.3.1
 release=1
 source=(https://download.savannah.gnu.org/releases/$name/$name-$version.tar.gz)
 
@@ -16,7 +16,9 @@ build() {
 	            --disable-static      \
 	            --libexecdir=/usr/lib
         make
-        make DESTDIR=$PKG install
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
+	make DESTDIR=$PKG install
 
         mkdir -p $PKG/lib
         mv -v $PKG/usr/lib/libacl.so.* $PKG/lib

diff --git a/ports/core/attr/Pkgfile b/ports/core/attr/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=attr
-version=2.4.48
+version=2.5.1
 release=1
 source=(https://download.savannah.gnu.org/releases/$name/$name-$version.tar.gz)
 
@@ -16,6 +16,8 @@ build() {
 	            --disable-static  \
 	            --sysconfdir=/etc
         make
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 
         mkdir -p $PKG/lib

diff --git a/ports/core/autoconf/Pkgfile b/ports/core/autoconf/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=autoconf
-version=2.69
+version=2.71
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
 
@@ -13,5 +13,7 @@ build() {
 
         ./configure --prefix=/usr
         make
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 }
diff --git a/ports/core/automake/Pkgfile b/ports/core/automake/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=automake
-version=1.16.2
+version=1.16.5
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
 
@@ -13,5 +13,7 @@ build() {
 
         ./configure --prefix=/usr
         make
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 }
diff --git a/ports/core/bash/Pkgfile b/ports/core/bash/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=bash
-version=5.0
+version=5.1.16
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 
@@ -15,6 +15,8 @@ build() {
 	            --without-bash-malloc            \
 	            --with-installed-readline
         make
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 
         mkdir -p $PKG/bin

diff --git a/ports/core/bc/Pkgfile b/ports/core/bc/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=bc
-version=3.1.6
+version=5.2.1
 release=1
 source=(https://github.com/gavinhoward/bc/archive/$version/bc-$version.tar.gz)
 
@@ -13,5 +13,7 @@ build() {
 
         PREFIX=/usr CC=gcc CFLAGS="-std=c99" ./configure.sh -G -O3
         make
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 }
diff --git a/ports/core/binutils/Pkgfile b/ports/core/binutils/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=binutils
-version=2.35.1
+version=2.37
 release=1
 source=(https://ftp.gnu.org/gnu/binutils/$name-$version.tar.xz)
 
@@ -26,5 +26,7 @@ build() {
 	             --enable-multilib   \
 	             --with-lib-path=/usr/lib:/lib:/usr/lib32
         make tooldir=/usr
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make tooldir=/usr DESTDIR=$PKG install
 }
diff --git a/ports/core/bison/Pkgfile b/ports/core/bison/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=bison
-version=3.7.3
+version=3.8.2
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
 
@@ -13,5 +13,7 @@ build() {
 
         ./configure --prefix=/usr
 	make -j1
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make -j1 DESTDIR=$PKG install
-}
+}
diff --git a/ports/core/bzip2/Pkgfile b/ports/core/bzip2/Pkgfile
@@ -21,6 +21,8 @@ build() {
         make -f Makefile-libbz2_so
         make clean
         make
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make PREFIX=$PKG/usr install
 
         mkdir -pv $PKG/{bin,lib,usr/lib}

diff --git a/ports/core/ca-certificates/Pkgfile b/ports/core/ca-certificates/Pkgfile
@@ -23,7 +23,8 @@ build() {
 
 	cp certdata.txt $PKG/etc/ssl
 	install -vm755 make-ca.sh-$version $PKG/usr/sbin/make-ca
-
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
 	$PKG/usr/sbin/make-ca -D $PKG
 
 	ln -sv /etc/ssl/ca-bundle.crt $PKG/etc/ssl/certs/ca-certificates.crt

diff --git a/ports/core/coreutils/Pkgfile b/ports/core/coreutils/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=coreutils
-version=8.32
+version=9.0
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz
        coreutils-i18n-1.patch)
@@ -23,6 +23,8 @@ build() {
                 --prefix=/usr \
                 --enable-no-install-program=kill,uptime
         make
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 
 	mkdir -pv $PKG/{bin,usr/sbin}

diff --git a/ports/core/curl/Pkgfile b/ports/core/curl/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  ca-certificates openssl
 
 name=curl
-version=7.73.0
+version=7.81.0
 release=1
 source=(https://curl.haxx.se/download/$name-$version.tar.xz)
 
@@ -16,5 +16,7 @@ build() {
                     --enable-threaded-resolver \
                     --with-ca-path=/etc/ssl/certs
 	make
+	mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
 	make DESTDIR=$PKG install
 }
diff --git a/ports/core/dbus/Pkgfile b/ports/core/dbus/Pkgfile
@@ -24,6 +24,8 @@ build() {
 	            --with-system-pid-file=/run/dbus/pid \
         	    --with-system-socket=/run/dbus/system_bus_socket
 	make
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
 	make DESTDIR=$PKG install
 
 	mkdir -p $PKG/lib

diff --git a/ports/core/dhcpcd/Pkgfile b/ports/core/dhcpcd/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=dhcpcd
-version=9.3.2
+version=9.4.1
 bootscriptsversion=20201002
 release=1
 source=(https://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.xz
@@ -16,6 +16,8 @@ build() {
 	./configure --libexecdir=/lib/dhcpcd \
                     --dbdir=/var/lib/dhcpcd
 	make
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
 	make DESTDIR=$PKG install
 
         cd ../blfs-bootscripts-$bootscriptsversion
@@ -29,4 +31,6 @@ SERVICE="dhcpcd"
 #DHCP_START="-b -q <insert appropriate start options here>"
 #DHCP_STOP="-k <insert additional stop options here>"
 EOF
+
+
 }
diff --git a/ports/core/diffutils/Pkgfile b/ports/core/diffutils/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  bash
 
 name=diffutils
-version=3.7
+version=3.8
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
 
@@ -13,5 +13,7 @@ build() {
 
         ./configure --prefix=/usr
         make
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 }
diff --git a/ports/core/dosfstools/Pkgfile b/ports/core/dosfstools/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=dosfstools
-version=4.1
+version=4.2
 release=1
 source=(https://github.com/dosfstools/dosfstools/releases/download/v$version/dosfstools-$version.tar.xz)
 
@@ -16,5 +16,7 @@ build() {
                     --mandir=/usr/share/man  \
                     --docdir=/usr/share/doc/$name
         make
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 }
diff --git a/ports/core/e2fsprogs/Pkgfile b/ports/core/e2fsprogs/Pkgfile
@@ -23,6 +23,8 @@ build() {
                      --disable-uuidd         \
                      --disable-fsck
         make
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
         make DESTDIR=$PKG install-libs
 

diff --git a/ports/core/efibootmgr/Pkgfile b/ports/core/efibootmgr/Pkgfile
@@ -17,4 +17,6 @@ build() {
 	EFIDIR=/boot/efi make
         install -D src/efibootmgr $PKG/usr/sbin/efibootmgr
         install -D src/efibootmgr.8 $PKG/usr/share/man/man8/efibootmgr.8
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
 }
diff --git a/ports/core/efivar/Pkgfile b/ports/core/efivar/Pkgfile
@@ -12,5 +12,7 @@ build() {
 	cd $name-$version
 	sed -e 's/-Werror//g' -i gcc.specs
         make -j1
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make libdir=/usr/lib DESTDIR=$PKG install
 }
diff --git a/ports/core/elfutils/Pkgfile b/ports/core/elfutils/Pkgfile
@@ -13,5 +13,7 @@ build() {
 
         ./configure --prefix=/usr --program-prefix="eu-" --disable-debuginfod
         make
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 }
diff --git a/ports/core/eudev/Pkgfile b/ports/core/eudev/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=eudev
-version=3.2.9
+version=3.2.10
 release=1
 source=(https://dev.gentoo.org/~blueness/$name/$name-$version.tar.gz)
 
@@ -22,7 +22,8 @@ build() {
                     --enable-manpages       \
                     --disable-static
         make
-
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         mkdir -pv $PKG/lib/udev/rules.d
         mkdir -pv $PKG/etc/udev/rules.d
 

diff --git a/ports/core/expat/Pkgfile b/ports/core/expat/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  
 
 name=expat
-version=2.2.10
+version=2.4.2
 release=1
 source=(https://sourceforge.net/projects/expat/files/expat/$version/expat-$version.tar.bz2)
 
@@ -17,5 +17,7 @@ build() {
 	./configure --prefix=/usr    \
 	            --disable-static
         make
+        mkdir -pv $PKG/var/lib/scratchpkg/db
+        echo "$version release=1" >> $PKG/var/lib/scratchpkg/db/$name
         make DESTDIR=$PKG install
 }