updated to 9.0

Author: KeithDHedger

.gitignore

@@ -7,4 +7,5 @@ cdtree/LFS/LFSPkgBuilds
 hostkeys
 *.iso
 workingfiles
-extenallinks
+extenallinks
+cdtree/LFS/*

ChangeLog

@@ -1,3 +1,5 @@
+Updated for LFS9.0
+
 Changed addresses.
 getSources script now checks md5sum of downloaded sources.
 Get latest lfspkg build scripts from git hub repo.

Makefile

@@ -1,5 +1,5 @@
 
-VERSION=8.2
+VERSION=9.0
 TOPDIR=$(shell pwd)
 ISODEPS=$(shell find  $(TOPDIR)/cdtree -not -name "\.*")
 BOOTCDNAME=LFSBootCD-$(VERSION).iso
@@ -52,6 +52,7 @@ clean:
 	rm -f $(TOPDIR)/$(BOOTCDNAME) $(TOPDIR)/cdtree/isolinux/sdisk32.img  $(TOPDIR)/cdtree/isolinux/sdisk64.img
 	rm -rf $(TOPDIR)/loop2
 	rm -f $(TOPDIR)/wget-list*
+	rm -f $(TOPDIR)/gotpkgbuilds
 
 distclean:
 	rm -f $(TOPDIR)/$(BOOTCDNAME) $(TOPDIR)/cdtree/isolinux/sdisk32.img  $(TOPDIR)/cdtree/isolinux/sdisk64.img $(TOPDIR)/tftp_area.tar.gz||true
@@ -61,3 +62,12 @@ distclean:
 	rm $(TOPDIR)/root_tree32.tar.xz $(TOPDIR)/root_tree64.tar.xz||true
 	rm $(TOPDIR)/bootcd.tar.xz||true
 
+nearlyclean:
+	rm -f $(TOPDIR)/$(BOOTCDNAME) $(TOPDIR)/cdtree/isolinux/sdisk32.img  $(TOPDIR)/cdtree/isolinux/sdisk64.img
+	rm -rf $(TOPDIR)/cdtree/LFS/LFSPkgBuilds
+	rm -rf $(TOPDIR)/cdtree/LFS/gotpkgbuilds
+
+
+
+
+

README.md

@@ -6,12 +6,14 @@ https://git-lfs.github.com/
 All commands marked with * MUST be run as root to preserve permissions ( don't type the *! ).
 
 *make clean
+Doesn't remove source archives.
+* make nearlyclean
 
 OR to remove the ssh keys folder
 *make distclean
 
 Grab external sources etc, this may take some time if you have a slow connection approx download 825M, this includes all the sources to build a functioning LFS system
-*make SOURCES
+make SOURCES
 
 *make CD
 

cdtree/isolinux/isolinux.bin

@@ -2,30 +2,34 @@
 
 #©keithhedger Wed 14 Jun 19:51:12 BST 2017 kdhedger68713@gmail.com
 
-LFSVERSION="8.2"
+LFSVERSION="9.0"
+#LFSGITVERSION="$LFSVERSION"
+LFSGITVERSION="dev"
+
 SYSTEMSOURCE=cdtree/LFS/LFSSourceArchives/$LFSVERSION/SYSTEM
 NETSOURCE=cdtree/LFS/LFSSourceArchives/$LFSVERSION/NET
 SYSSOURCE=cdtree/LFS/LFSSourceArchives/$LFSVERSION/SYS
+WGET_VERS=1.20.3
 
-WGETTAR="http://ftp.gnu.org/gnu/wget/wget-1.19.4.tar.gz"
+WGETTAR="https://ftp.gnu.org/gnu/wget/wget-$WGET_VERS.tar.gz"
 UNZIPTAR="http://downloads.sourceforge.net/infozip/unzip60.tar.gz"
 
 #TOOLS32TAR="https://www.dropbox.com/s/00d9g99v1h7yzpn/tools-8.0_32.tar.bz2"
 #TOOLS64TAR="https://www.dropbox.com/s/m8spbezuuc1e9q2/tools-8.0_64.tar.bz2"
-TOOLS32TAR="https://www.dropbox.com/s/a7keub18zn90esl/tools-8.2_32.tar.bz2"
-TOOLS64TAR="https://www.dropbox.com/s/wtis8ag8nwz1nzy/tools-8.2_64.tar.bz2"
+#TOOLS32TAR="https://www.dropbox.com/s/a7keub18zn90esl/tools-8.2_32.tar.bz2"
+#TOOLS64TAR="https://www.dropbox.com/s/wtis8ag8nwz1nzy/tools-8.2_64.tar.bz2"
+TOOLS32TAR="https://www.dropbox.com/s/dlmmd5us8bn86zt/tools-9.0_32.tar.bz2"
+TOOLS64TAR="https://www.dropbox.com/s/l2uer2qfy7czh9j/tools-9.0_64.tar.bz2"
 ROOT32TAR="https://www.dropbox.com/s/ktxt3pwljmki6ns/root_tree32.tar.xz"
 ROOT64TAR="https://www.dropbox.com/s/wqxswj35gvrqqfv/root_tree64.tar.xz"
 
-LFSPKGBUILDS="https://github.com/KeithDHedger/LFSPkgBuilds/archive/${LFSVERSION}.zip"
+LFSPKGBUILDS="https://github.com/KeithDHedger/LFSPkgBuilds/archive/${LFSGITVERSION}.zip"
 LFSPKG="https://github.com/KeithDHedger/LFSPkg/archive/master.zip"
 
 mkdir -vp cdtree/LFS $NETSOURCE $SYSSOURCE $SYSTEMSOURCE||true
 
 if [ ! -e $SYSTEMSOURCE/gotsystemsources ];then
 	wget http://www.linuxfromscratch.org/lfs/view/$LFSVERSION/wget-list
-	#bzip2 link broken in wget-list
-	sed -i 's@.*bzip2-1\.0\.6\.tar\.gz*@http://anduin.linuxfromscratch.org/LFS/bzip2-1.0.6.tar.gz@' wget-list
 	wget http://www.linuxfromscratch.org/lfs/view/$LFSVERSION/md5sums
 	mv md5sums $SYSTEMSOURCE
 	wget -i wget-list -c -P $SYSTEMSOURCE
@@ -55,9 +59,9 @@ fi
 if [ ! -e cdtree/LFS/gotpkgbuilds ];then
 	pushd cdtree/LFS
 		wget -c "$LFSPKGBUILDS"
-		unzip ${LFSVERSION}.zip
-		mv LFSPkgBuilds-${LFSVERSION} LFSPkgBuilds
-		rm -r LFSPkgBuilds/.gitignore ${LFSVERSION}.zip
+		unzip ${LFSGITVERSION}.zip
+		mv LFSPkgBuilds-${LFSGITVERSION} LFSPkgBuilds
+		rm -r LFSPkgBuilds/.gitignore ${LFSGITVERSION}.zip
 		cp -r ../../LFSScripts/BuildFileSystem LFSPkgBuilds/LFSScripts
 		pushd LFSPkgBuilds/LFSPkgBuildScripts/admin/LFSPkg
 			wget -c $LFSPKG

getSources

@@ -35,9 +35,11 @@ readWithDefault ()
 case $(uname -m) in
 	x86_64)
 		LIBDIRSUFFIX=64
+		LFSNAME=${LFSNAME:-"LFS9064"}
 		;;
 	*)
 		LIBDIRSUFFIX=""
+		LFSNAME=${LFSNAME:-"LFS9032"}
 		;;
 esac
 
@@ -53,11 +55,11 @@ LFS=${LFS:-"/mnt/LFS"}
 readWithDefault "LFS"  "Enter Mountpoint For LFS"
 
 #LFS Version
-LFSVERSION=${LFSVERSION:-8.2}
+LFSVERSION=${LFSVERSION:-9.0}
 readWithDefault "LFSVERSION"  "Enter Version"
 
 #Computer name
-LFSNAME=${LFSNAME:-"LFSDev"}
+#LFSNAME=${LFSNAME:-"LFS9064"}
 readWithDefault "LFSNAME"  "Enter Hostname"
 
 #LFS init type eithe bbinit or sysvinit
@@ -81,7 +83,7 @@ readWithDefault "SOURCEARCHIVES"  "Enter Folder For Source Archives"
 
 #kernal version
 #if the kernel version you want to use is not the same as the book you will have to manually download the source to $SOURCEARCHIVES
-KERNELVERSION=${KERNELVERSION:-"4.15.3"}
+KERNELVERSION=${KERNELVERSION:-"5.2.8"}
 readWithDefault "KERNELVERSION"  "Enter Kernel Version"
 
 #keyboard
@@ -158,7 +160,7 @@ cp -r ${CDROMMOUNT}/LFS/LFSPkgBuilds ${LFS}
 ln -sfv LFSPkgBuilds/LFSPkgBuildScripts .
 ln -sfv LFSPkgBuilds/LFSScripts .
 
-mkdir ${LFS}/tools
+mkdir -p ${LFS}/tools
 pushd ${LFS}/tools
 	case $(uname -m) in
 		*64)
@@ -174,10 +176,8 @@ mkdir -vp "${LFS}/$SOURCEARCHIVES" "${LFS}/$BUILTPACKAGES"
 cp -rv ${CDROMMOUNT}/LFS/LFSSourceArchives/${LFSVERSION}/* ${LFS}/$SOURCEARCHIVES
 
 #set kernel version in build scripts
-#build scripts should be at $LFS/LFSPkgBuildScripts
-sed -ri 's/^VERSION="[0-9]+.[0-9]+.[0-9]+"/VERSION="'"${KERNELVERSION}"'"/' ${LFS}/${BUILDSCRIPTS}/system/linuxheaders/linuxheaders.LFSBuild
 sed -ri 's/^VERSION="[0-9]+.[0-9]+.[0-9]+"/VERSION="'"${KERNELVERSION}"'"/' ${LFS}/${BUILDSCRIPTS}/kernel/kernel.LFSBuild
-sed -ri "s/linuxheaders-[0-9]+.[0-9]+.[0-9]+/linuxheaders-${KERNELVERSION}/i" ${LFS}/${BUILDSCRIPTS}/system/system-meta/system-${INITTYPE}-meta.LFSBuild
+sed -ri 's/^VERSION="[0-9]+.[0-9]+.[0-9]+"/VERSION="'"${KERNELVERSION}"'"/' ${LFS}/${BUILDSCRIPTS}/kernel/firmware.LFSBuild
 
 ln -svf system-${INITTYPE}-meta.LFSBuild ${LFS}/${BUILDSCRIPTS}/system/system-meta/system-meta.LFSBuild