removed redundant grub dep for pi system install

This commit is contained in:
K D Hedger
2020-04-27 20:18:23 +01:00
parent b73bd3b342
commit e542b04f25
5 changed files with 10 additions and 7 deletions

View File

@ -1,4 +1,6 @@
9.0
Loads of fixes for rpi4 install.
Load of fixes for new lfspkg app.
Updetedbuild tools script.
Switch to 9.0 dev branch.

View File

@ -70,7 +70,6 @@ Diffutils-3.7
Gawk-5.0.1
Findutils-4.6.0
Groff-1.22.4
GRUB-2.04
Less-551
Gzip-1.10
IPRoute2-5.2.0
@ -109,8 +108,8 @@ BUILD=${BUILD:-1}
SECTION="SYSTEM"
SUFFIX="LFSPKG"
#Set this to your blank boot partition, if NOT set boot files are not copied.
PIBOOTDEV="/dev/mmcblk0p10"
PIROOTDEV="/dev/mmcblk0p11"
PIBOOTDEV="/dev/mmcblk0p15"
PIROOTDEV="/dev/mmcblk0p16"
ROOTFSTYPE="ext2"
KERNELVERSION="4.19.y"

View File

@ -343,7 +343,8 @@ CHECKETC=0
EOF
mv /tmp/.lfspkg.rc root
chown -R root:root $LFS/*
#Set the perms for $LFS will fail for any mounted network tha can't have their perms changed ( eg a smaba mount ).
chown -R root:root $LFS/* 2>/dev/null||true
touch var/log/{btmp,lastlog,wtmp}
chmod -v 664 var/log/lastlog
chmod -v 600 var/log/btmp

View File

@ -135,7 +135,7 @@ readWithDefault "ROOTFSTYPE" "Enter Root FS Type"
ROOTDEV=$(findmnt -no SOURCE $LFS)
readWithDefault "ROOTDEV" "Enter Root Device"
SWAP=$(blkid|grep swap|tail -n1|awk -F: '{print $1}')
SWAP=${SWAP:-$(blkid|grep swap|tail -n1|awk -F: '{print $1}')}
readWithDefault "SWAP" "Enter Swap Device Or Path To Swapfile"
LANGUAGE=${LANGUAGE:-$LANG}
@ -191,7 +191,7 @@ echo "--------"
SUMMARY="N/y"
readWithDefault "SUMMARY" "Write Config Files And Copy Data Etc"
if [ $SUMMARY = "n" ];then
if [ ${SUMMARY^^} != "Y" ];then
exit 1
fi
@ -225,7 +225,7 @@ LIBDIRSUFFIX=$LIBDIRSUFFIX
SOURCEARCHIVES=$SOURCEARCHIVES
PKGARCHIVES=$PKGARCHIVES
EXTFOLDER=$EXTFOLDER
COMPILEAT=\${COMPILEAT:-$COMPILEAT}
COMPILEAT=$COMPILEAT
BUILDSCRIPTS=$BUILDSCRIPTS
KEYBOARD=$KEYBOARD

View File

@ -23,6 +23,7 @@ echo "INIT type:" $INITTYPE
echo
echo "Folder for downloaded source archives:" $SOURCEARCHIVES
echo "Folder for built packages:" $BUILTPACKAGES
echo "Compile in this folder:" $COMPILEAT
echo "Package Folders Bound To Folder:" $EXTFOLDER
echo
echo "LFS language:" $LANGUAGE