Update images to buildroot 2017.05.1

- Change PBA?? to ??bit for easier tab completion
- Remove TinyCore - Rescue now same Kernel/libs as PBA
- Add Rescue64 image - UEFI 64 bit image
- No debug PBAs as debugging is now built into PBA
- create/use buildroot package for sedutil-cli and linuxpba to remove lib version issues
- increase size of PBA images to handle larger kernel
- increase size of Rescue to include PBA images

Author: r0m30

images/buildUEFI64

@@ -4,8 +4,8 @@ set -x
 ## define releases for tools
 . conf
 VERSIONINFO=`git describe --dirty` || VERSIONINFO=downloaded
-BUILDTYPE=$1
-BUILDIMG=UEFI64_${1}-${VERSIONINFO}.img
+BUILDTYPE=Release
+BUILDIMG=UEFI64_${BUILDTYPE}-${VERSIONINFO}.img
 if [ "$BUILDTYPE" == "Debug" ] || [ "$BUILDTYPE" == "Release" ] ; then
             echo "Building " $BUILDTYPE "image"
 	else
@@ -17,24 +17,17 @@ fi
 ## check that everything is available
 [ -f scratch/${SYSLINUX}/efi64/efi/syslinux.efi -a \
   -f scratch/${SYSLINUX}/efi64/com32/elflink/ldlinux/ldlinux.e64 -a \
-     -f ../LinuxPBA/dist/${BUILDTYPE}_x86_64/GNU-Linux/linuxpba -a \
-     -f ../linux/CLI/dist/${BUILDTYPE}_x86_64/GNU-Linux/sedutil-cli -a \
-      -f scratch/buildroot/PBA64/images/bzImage  -a \
-      -f buildroot/syslinux.cfg \
+  -f scratch/buildroot/64bit/images/bzImage  -a \
+  -f scratch/buildroot/64bit/images/rootfs.cpio.xz  -a \
+  -f scratch/buildroot/64bit/target/sbin/linuxpba  -a \
+  -f scratch/buildroot/64bit/target/sbin/sedutil-cli  -a \
+  -f buildroot/syslinux.cfg \
   ] || { echo " prereqs are not available "; exit 1; }
-# recreate the initrd file with the latest PBA
-mkdir scratch/buildroot/PBA64/overlay/sbin/
-cp ../LinuxPBA/dist/${BUILDTYPE}_x86_64/GNU-Linux/linuxpba  scratch/buildroot/PBA64/overlay/sbin/linuxpba
-cp ../linux/CLI/dist/${BUILDTYPE}_x86_64/GNU-Linux/sedutil-cli  scratch/buildroot/PBA64/overlay/sbin/sedutil-cli
-cd scratch/buildroot
-make all O=PBA64 2>&1 >PBA64.log
-cd ../..
 # Start fresh
 sudo rm -rf UEFI64_${BUILDTYPE} ; mkdir UEFI64_${BUILDTYPE} ; cd UEFI64_${BUILDTYPE}
 # make an image file
-dd if=/dev/zero of=${BUILDIMG} bs=1M count=7
+dd if=/dev/zero of=${BUILDIMG} bs=1M count=32
 (echo "n";echo "";echo "";echo "";echo "ef00";echo w;echo Y) | gdisk ${BUILDIMG}
-
 LOOPDEV=`sudo losetup --show -f -o 1048576 ${BUILDIMG}`
 sudo mkfs.vfat $LOOPDEV -n UEFI64_${BUILDTYPE}
 sudo mkdir image
@@ -43,8 +36,8 @@ sudo chmod 777 image
 sudo mkdir -p image/EFI/boot
 sudo cp ../scratch/${SYSLINUX}/efi64/efi/syslinux.efi image/EFI/boot/bootx64.efi
 sudo cp ../scratch/${SYSLINUX}/efi64/com32/elflink/ldlinux/ldlinux.e64 image/EFI/boot/
-sudo cp ../scratch/buildroot/PBA64/images/bzImage image/EFI/boot/
-sudo cp ../scratch/buildroot/PBA64/images/rootfs.cpio.xz image/EFI/boot/
+sudo cp ../scratch/buildroot/64bit/images/bzImage image/EFI/boot/
+sudo cp ../scratch/buildroot/64bit/images/rootfs.cpio.xz image/EFI/boot/
 sudo cp ../buildroot/syslinux.cfg image/EFI/boot/
 sudo umount image
 sudo losetup -d $LOOPDEV

images/buildbiosLinux

@@ -4,8 +4,8 @@ set -x
 ## define releases for tools
 . conf
 VERSIONINFO=`git describe --dirty`
-BUILDTYPE=$1
-BUILDIMG=LINUXPBA${1}-${VERSIONINFO}.img
+BUILDTYPE=Release
+BUILDIMG=LINUXPBA${BUILDTYPE}-${VERSIONINFO}.img
 if [ "$BUILDTYPE" == "Debug" ] || [ "$BUILDTYPE" == "Release" ] ; then
             echo "Building " $BUILDTYPE "image"
 	else
@@ -14,23 +14,18 @@ if [ "$BUILDTYPE" == "Debug" ] || [ "$BUILDTYPE" == "Release" ] ; then
 fi
 
 # Start fresh
-sudo rm -rf LINUXPBA${BUILDTYPE} ; mkdir LINUXPBA${BUILDTYPE} ; cd LINUXPBA${BUILDTYPE}
 ## check that everything is available
-[ -f ../scratch/${SYSLINUX}/bios/mbr/mbr.bin -a \
-     -x ../scratch/${SYSLINUX}/bios/extlinux/extlinux -a \
-     -f ../../LinuxPBA/dist/${BUILDTYPE}/GNU-Linux/linuxpba -a \
-     -f ../../linux/CLI/dist/${BUILDTYPE}_i686/GNU-Linux/sedutil-cli -a \
-     -f ../scratch/buildroot/PBA32/images/bzImage  \
+[ -f scratch/${SYSLINUX}/bios/mbr/mbr.bin -a \
+  -x scratch/${SYSLINUX}/bios/extlinux/extlinux -a \
+  -f scratch/buildroot/32bit/images/bzImage  -a \
+  -f scratch/buildroot/32bit/images/rootfs.cpio.xz  -a \
+  -x scratch/buildroot/32bit/target/sbin/linuxpba  -a \
+  -x scratch/buildroot/32bit/target/sbin/sedutil-cli  -a \
+  -f buildroot/syslinux.cfg \
   ] || { echo " prereqs are not available "; exit 1; }
 #
-# recreate the initrd file with the latest PBA
-mkdir  ../scratch/buildroot/PBA32/overlay/sbin
-cp ../../LinuxPBA/dist/${BUILDTYPE}/GNU-Linux/linuxpba  ../scratch/buildroot/PBA32/overlay/sbin/linuxpba
-cp ../../linux/CLI/dist/${BUILDTYPE}_i686/GNU-Linux/sedutil-cli  ../scratch/buildroot/PBA32/overlay/sbin/sedutil-cli
-cd ../scratch/buildroot
-make all O=PBA32 2>&1 >PBA32.log
-cd ../../LINUXPBA${BUILDTYPE}
-dd if=/dev/zero of=${BUILDIMG} bs=1M count=8
+sudo rm -rf LINUXPBA${BUILDTYPE} ; mkdir LINUXPBA${BUILDTYPE} ; cd LINUXPBA${BUILDTYPE}
+dd if=/dev/zero of=${BUILDIMG} bs=1M count=32
 (echo o;echo n;echo p;echo 1;echo"";echo "";echo "";echo a;echo 1;echo w) | fdisk ${BUILDIMG}
 dd if=../scratch/${SYSLINUX}/bios/mbr/mbr.bin of=${BUILDIMG} count=1 conv=notrunc bs=512
 LOOPDEV=`sudo losetup --show -f -o 1048576 ${BUILDIMG}`
@@ -40,8 +35,8 @@ sudo mount $LOOPDEV image
 sudo chmod 777 image
 sudo mkdir -p image/boot/extlinux
 sudo ../scratch/${SYSLINUX}/bios/extlinux/extlinux --install image/boot/extlinux
-sudo cp ../scratch/buildroot/PBA32/images/bzImage  image/boot/extlinux/
-sudo cp ../scratch/buildroot/PBA32/images/rootfs.cpio.xz image/boot/extlinux/
+sudo cp ../scratch/buildroot/32bit/images/bzImage  image/boot/extlinux/
+sudo cp ../scratch/buildroot/32bit/images/rootfs.cpio.xz image/boot/extlinux/
 sudo cp ../buildroot/syslinux.cfg image/boot/extlinux/extlinux.conf
 sudo umount image
 sudo losetup -d $LOOPDEV

images/buildpbaroot

@@ -1,5 +1,5 @@
 #!/bin/bash
-set +x
+set -x
 function die {
 echo An error has occured please fix this and start over
 exit 99
@@ -13,32 +13,37 @@ cd buildroot
 git checkout -b PBABUILD ${BUILDROOT_TAG}  || die
 git reset --hard
 git clean -df
-#fix ncurses build to include libtinfo for compat
-cp ../../buildroot/ncurses.mk package/ncurses/
 # add out of tree build directoried and files
-
 # 64 bit system
-mkdir PBA64
-cp ../../buildroot/PBA64/.config PBA64/
-cp ../../buildroot/PBA64/* PBA64/
-cp -r ../../buildroot/PBA64/overlay PBA64/
-
+mkdir 64bit
+cp ../../buildroot/64bit/.config 64bit/
+cp ../../buildroot/64bit/* 64bit/
+cp -r ../../buildroot/64bit/overlay 64bit/
 # 32 bit system
-mkdir PBA32
-cp ../../buildroot/PBA32/.config PBA32/
-cp ../../buildroot/PBA32/* PBA32/
-cp -r ../../buildroot/PBA32/overlay PBA32/
-
-echo This is going to take a while ..... Press enter to continue
+mkdir 32bit
+cp ../../buildroot/32bit/.config 32bit/
+cp ../../buildroot/32bit/* 32bit/
+cp -r ../../buildroot/32bit/overlay 32bit/
+# add the current buildroot packages
+sed -i '/sedutil/d' package/Config.in
+sed -i '/menu "System tools"/a \\tsource "package/sedutil/Config.in"' package/Config.in
+cp -r ../../buildroot/packages/sedutil/ package/
+# Make a distribution from the current source
+cd ../../..
+autoreconf 
+./configure
+make dist
+mkdir images/scratch/buildroot/dl/
+cp sedutil-*.tar.gz images/scratch/buildroot/dl/
+make distclean
+cd images/scratch/buildroot
+# build the rootfs for 64 and 32 bit systems
+echo Building bootable systems for the PBA, this is going to take a while ..... Press enter to continue
 read INOUT
 echo Making the 64bit PBA Linux system
-make O=PBA64 2>&1 | tee PBA64/build_output.txt
+make O=64bit 2>&1 | tee 64bit/build_output.txt
 echo Making the 32bit PBA Linux system
-make O=PBA32 2>&1 | tee PBA32/build_output.txt
-# List the stuff we need to check
-echo Checking for customizations...... 
-grep -i pba PBA*/target/etc/inittab
-grep -i libtinfo PBA*/target/etc/ld.so.cache
+make O=32bit 2>&1 | tee 32bit/build_output.txt
 # back to where we started
 cd ../..
-exit 0
+exit 0