diff --git a/bin/build.sh b/bin/build.sh index 3547fc1..f164a46 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -155,6 +155,22 @@ then exit 0 fi +# implement for future, needs tweaking- JUST rebuild the ISO. +#if [[ ${1} == "respin" ]]; +#then +# if [[ "${MULTIARCH}" == "y" ]]; +# then +# centos_is_stupid +# yo_dj any +# else +# centos_is_stupid +# yo_dj 64 +# centos_is_stupid +# yo_dj 32 +# fi +#fi +# + # or are we just building? if [[ ${1} == "build" || -z ${1} || ${1} == "all" ]]; then diff --git a/extra/bootstrap/apacman-1.9-1-any.pkg.tar.xz b/extra/bootstrap/apacman-1.9-1-any.pkg.tar.xz deleted file mode 100644 index 37272ec..0000000 Binary files a/extra/bootstrap/apacman-1.9-1-any.pkg.tar.xz and /dev/null differ diff --git a/extra/bootstrap/apacman-2.3-1-any.pkg.tar.xz b/extra/bootstrap/apacman-2.3-1-any.pkg.tar.xz new file mode 100644 index 0000000..1a2918e Binary files /dev/null and b/extra/bootstrap/apacman-2.3-1-any.pkg.tar.xz differ diff --git a/extra/packages.both b/extra/packages.both index dda5f6f..cb91296 100644 --- a/extra/packages.both +++ b/extra/packages.both @@ -54,7 +54,7 @@ dd_rescue dd_rhelp debianutils debootstrap -dialog +#dialog #giving a weird dependency issue diffutils djohn dmidecode @@ -141,8 +141,7 @@ keyutils kismet-allplugins lftp links -#logkeys -logkeys-keymaps +logkeys-git lm_sensors lrzsz lshw @@ -254,7 +253,7 @@ smartmontools smbclient s-nail socat -#star ## do people even USE tape packups anymore? +#star ## do people even USE tape backups anymore? storcli strace stress @@ -271,7 +270,7 @@ thttpd tmon tmux tre -truecrack-svn +truecrack-git truecrypt tor udftools @@ -296,7 +295,7 @@ vncrack vnstat vpnc weplab -whdd +#whdd #currently depends on dialog, which is broke as shit whois wifite-mod-pixiewps-git wipe diff --git a/extra/pre-build.d/etc/apacman.conf b/extra/pre-build.d/etc/apacman.conf index 3723234..f9e124a 100644 --- a/extra/pre-build.d/etc/apacman.conf +++ b/extra/pre-build.d/etc/apacman.conf @@ -11,27 +11,26 @@ #buildonly=1 #cachevcs=1 #ignorearch=1 -#needed=1 +#keepkeys=1 +needed=1 +#noaur=1 noconfirm=1 noedit=1 -#noaur=1 -#noconfirm=1 -#noedit=1 -#nofail=1 +nofail=1 #preview=1 -#purgebuild=1 +progress=1 +purgebuild=1 #quiet=1 -#skipcache=1 -skipinteg=1 +skipcache=1 +#skipinteg=1 #skiptest=1 #warn=1 -#tmpdir=/var/tmp/apacman -#TMPDIR=/var/tmp/apacman # # CONFIGURATION # +#builddir="/tmp/pkgbuild-$UID" #tmpdir="/tmp/apacmantmp-$UID" #makepkgconf="/etc/makepkg.conf" #usermakepkgconf="$HOME/.makepkg.conf" @@ -39,19 +38,21 @@ skipinteg=1 #downdir="/var/cache/pacman/pkg" #savedir="/var/cache/apacman/pkg" #editor="nano -w" -editor="vim" +#pager="less -R" #RPCURL="https://aur.archlinux.org/rpc.php?type" #PKGURL="https://aur.archlinux.org" +#WEBURL="https://www.archlinux.org" #ABSURL="rsync.archlinux.org" # # COLORIZATION # -COLOR1='\e[1;39m' -COLOR2='\e[1;32m' -COLOR3='\e[1;35m' -COLOR4='\e[1;36m' -COLOR5='\e[1;34m' -COLOR6='\e[1;33m' -COLOR7='\e[1;31m' +#COLOR1='\e[1;39m' +#COLOR2='\e[1;32m' +#COLOR3='\e[1;35m' +#COLOR4='\e[1;36m' +#COLOR5='\e[1;34m' +#COLOR6='\e[1;33m' +#COLOR7='\e[1;31m' + diff --git a/extra/pre-build.d/etc/mkinitcpio.conf b/extra/pre-build.d/etc/mkinitcpio.conf index f151ea1..22c7305 100644 --- a/extra/pre-build.d/etc/mkinitcpio.conf +++ b/extra/pre-build.d/etc/mkinitcpio.conf @@ -64,4 +64,4 @@ COMPRESSION="xz" # COMPRESSION_OPTIONS # Additional options for the compressor -#COMPRESSION_OPTIONS="" +COMPRESSION_OPTIONS="-9" diff --git a/extra/pre-build.d/etc/pacman.d/mirrorlist b/extra/pre-build.d/etc/pacman.d/mirrorlist index 6fefe45..0d60fc3 100644 --- a/extra/pre-build.d/etc/pacman.d/mirrorlist +++ b/extra/pre-build.d/etc/pacman.d/mirrorlist @@ -1,7 +1,6 @@ -# Server list generated by rankmirrors on 2014-11-10 -Server = http://mirror.rit.edu/archlinux/$repo/os/$arch -Server = http://mirror.cc.columbia.edu/pub/linux/archlinux/$repo/os/$arch -Server = http://mirrors.acm.wpi.edu/archlinux/$repo/os/$arch -Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch -Server = http://mirror.cs.pitt.edu/archlinux/$repo/os/$arch -Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch +Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch +Server = http://mirrors.gigenet.com/archlinux/$repo/os/$arch +Server = http://il.mirrors.linaxe.net/archlinux/$repo/os/$arch +Server = http://mirror.grig.io/archlinux/$repo/os/$arch +Server = http://arch.mirrors.ionfish.org/$repo/os/$arch +Server = http://cosmos.cites.illinois.edu/pub/archlinux/$repo/os/$arch diff --git a/lib/01-mk.chroot.func.sh b/lib/01-mk.chroot.func.sh index 37694de..c6545a2 100755 --- a/lib/01-mk.chroot.func.sh +++ b/lib/01-mk.chroot.func.sh @@ -179,7 +179,7 @@ EOF for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done echo "Done." echo -n "...Upgrading any outdated packages..." - ${CHROOTCMD} ${i}/ pacman -Syyu --noconfirm >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${i}/ pacman -Syyu --force --noconfirm >> "${LOGFILE}.${FUNCNAME}" 2>&1 ${CHROOTCMD} ${i}/ pacman-key --refresh-keys >> "${LOGFILE}.${FUNCNAME}" 2>&1 for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done echo "Done. Finishing/cleaning up..." @@ -196,7 +196,7 @@ EOF #${CHROOTCMD} ${i} "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1 ${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz && mkdir /var/tmp/apacman && chmod 0750 /var/tmp/apacman && chown root:aurbuild /var/tmp/apacman " >> "${LOGFILE}.${FUNCNAME}" 2>&1 for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done - ${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit --skipinteg -S apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit --skipinteg -S apacman apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1 #rm -rf ${i}/var/tmp/pkg #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1 for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done diff --git a/lib/10-yo_dj.func.sh b/lib/10-yo_dj.func.sh index adcd6cc..a8f4701 100644 --- a/lib/10-yo_dj.func.sh +++ b/lib/10-yo_dj.func.sh @@ -379,8 +379,8 @@ EOF mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.eiso ${ISODIR}/${MINIFILENAME} make clean >> "${LOGFILE}.${FUNCNAME}" 2>&1 cd ${BASEDIR}/src/ipxe - git reset --hard >> "${LOGFILE}.${FUNCNAME}" 2>&1 git clean -xdf > /dev/null 2>&1 + git reset --hard >> "${LOGFILE}.${FUNCNAME}" 2>&1 git checkout master . > /dev/null 2>&1 #git reset --hard HEAD > /dev/null 2>&1 echo diff --git a/src/ipxe b/src/ipxe index 0af0888..6143057 160000 --- a/src/ipxe +++ b/src/ipxe @@ -1 +1 @@ -Subproject commit 0af08888329e29541d8525732d48e75ab1eebecc +Subproject commit 614305743031bdfc02cb4ce346e450cd1d476e17 diff --git a/src/ipxe_local/patches/ipxe-0002-banner.patch b/src/ipxe_local/patches/ipxe-0002-banner.patch index 6db1e86..d54b959 100644 --- a/src/ipxe_local/patches/ipxe-0002-banner.patch +++ b/src/ipxe_local/patches/ipxe-0002-banner.patch @@ -1,5 +1,5 @@ ---- a/src/usr/autoboot.c 2015-06-29 04:18:17.055394598 -0400 -+++ b/src/usr/autoboot.c 2015-06-29 22:04:28.692916217 -0400 +--- a/src/usr/autoboot.c ++++ b/src/usr/autoboot.c @@ -71,6 +71,7 @@ #define NORMAL "\033[0m" #define BOLD "\033[1m" @@ -8,16 +8,16 @@ /** The "scriptlet" setting */ const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = { -@@ -560,9 +561,9 @@ +@@ -538,11 +539,10 @@ * do so. * */ - printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s" -- NORMAL " -- " PRODUCT_TAG_LINE " -- " -- CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version ); + printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME + NORMAL " -- " PRODUCT_TAG_LINE " -- " +- CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version ); + CYAN PRODUCT_URI NORMAL "\n" -+ BOLD BLUE "http://bdisk.square-r00t.net/" NORMAL "\n" ); - for_each_table_entry ( feature, FEATURES ) - printf ( " %s", feature->name ); ++ BOLD BLUE "https://bdisk.square-r00t.net/" NORMAL "\n" ); printf ( "\n" ); + + /* Boot system */ diff --git a/src/ipxe_local/patches/ipxe-0003-iso-efi.patch b/src/ipxe_local/patches/ipxe-0003-iso-efi.patch index b2aacb2..830a58b 100644 --- a/src/ipxe_local/patches/ipxe-0003-iso-efi.patch +++ b/src/ipxe_local/patches/ipxe-0003-iso-efi.patch @@ -5,21 +5,21 @@ Subject: [PATCH 1/1] allow to build ISO image with EFI support (ipxe.eiso) Signed-off-by: Christian Hesse --- - src/arch/i386/Makefile.pcbios | 6 +++++ + src/arch/x86/Makefile.pcbios | 6 ++++++ src/util/geniso | 52 +++++++++++++++++++++++++++++++++---------- 2 files changed, 46 insertions(+), 12 deletions(-) -diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios -index ff82373..c7a58eb 100644 ---- a/src/arch/i386/Makefile.pcbios -+++ b/src/arch/i386/Makefile.pcbios -@@ -59,6 +59,12 @@ NON_AUTO_MEDIA += iso - $(QM)$(ECHO) " [GENISO] $@" - $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) VERSION="$(VERSION)" bash util/geniso -o $@ $< +diff --git a/src/arch/x86/Makefile.pcbios b/src/arch/x86/Makefile.pcbios +index 18a6f75..9cb3e0b 100644 +--- a/src/arch/x86/Makefile.pcbios ++++ b/src/arch/x86/Makefile.pcbios +@@ -82,6 +82,12 @@ NON_AUTO_MEDIA += iso + $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) LDLINUX_C32=$(LDLINUX_C32) \ + VERSION="$(VERSION)" bash util/geniso -o $@ $< +# rule to make a non-emulation ISO boot image with EFI support -+NON_AUTO_MEDIA += eiso -+%eiso: %lkrn bin-i386-efi/ipxe.efi bin-x86_64-efi/ipxe.efi util/geniso ++NON_AUTO_MEDIA += eiso ++%eiso: %lkrn bin-i386-efi/ipxe.efi bin-x86_64-efi/ipxe.efi util/geniso + $(QM)$(ECHO) " [GENISO] $@" + $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) VERSION="$(VERSION)" bash util/geniso -e -o $@ $< +