diff --git a/debian-amd64/control b/debian-amd64/control index fb8c42a..c17114f 100644 --- a/debian-amd64/control +++ b/debian-amd64/control @@ -8,7 +8,7 @@ Homepage: http://www.wit.com Package: wit-pxeboot-amd64 Architecture: all -Depends: ${misc:Depends}, tftpd-hpa, pxelinux, syslinux-common +Depends: ${misc:Depends}, tftpd-hpa Description: kernel and initrd to pxeboot debcore kernel and initrd to boot a pxe image easily it also includes a rootfs to quickly kickstart diff --git a/debian-arm64/control b/debian-arm64/control index ea81dda..e4bd5f8 100644 --- a/debian-arm64/control +++ b/debian-arm64/control @@ -8,7 +8,7 @@ Homepage: http://www.wit.com Package: wit-pxeboot-arm64 Architecture: all -Depends: ${misc:Depends}, tftpd-hpa, pxelinux, syslinux-common +Depends: ${misc:Depends}, tftpd-hpa Description: kernel and initrd to pxeboot debcore kernel and initrd to boot a pxe image easily it also includes a rootfs to quickly kickstart diff --git a/drone-not-working.sh b/drone-not-working.sh index abfa5ed..4db6118 100755 --- a/drone-not-working.sh +++ b/drone-not-working.sh @@ -4,10 +4,11 @@ set -Eeuxo pipefail export TMP_DIR=$(mktemp -d) cp -r debian-$ARCH $TMP_DIR/debian cp -r files $TMP_DIR -echo -e "wit-pxeboot (1.0.$(date +%Y.%m.%d.%H.%M)) unstable; urgency=low\n\n$(git log --format=" * %s")\n\n -- wit $(date -R)" >$TMP_DIR/debian/changelog -sudo TMP_DIR=$TMP_DIR ./create_pxeinitrd.sh +echo -e "wit-pxeboot-$ARCH (1.0.$(date +%Y.%m.%d.%H.%M)) unstable; urgency=low\n\n$(git log --format=" * %s")\n\n -- wit $(date -R)" >$TMP_DIR/debian/changelog +sudo ARCH=$ARCH TMP_DIR=$TMP_DIR ./create_pxeinitrd.sh cd $TMP_DIR sudo dpkg-buildpackage --no-sign -scp -i ~/.ssh/packager -o StrictHostKeyChecking=no -P 22022 ../wit-pxeboot_*_all.deb root@cloud-api.v1.cloud.wit.com:/data/incoming -cd - -sudo rm -fr $TMP_DIR +ls -lha ../wit-pxeboot-${ARCH}_*_all.deb +echo scp -i ~/.ssh/packager -o StrictHostKeyChecking=no -P 22022 ../wit-pxeboot-${ARCH}_*_all.deb root@cloud-api.v2.stack.wit.com:/data/incoming +#cd - +#sudo rm -fr $TMP_DIR diff --git a/files/grub.cfg b/files/grub.cfg index e758406..d2e2046 100644 --- a/files/grub.cfg +++ b/files/grub.cfg @@ -6,23 +6,23 @@ menuentry "localboot" { } menuentry "debcore-x86_64" { - linux /wit-pxeboot/vmlinuz console=tty0 console=ttyS1,115200n8 size=5000 - initrd /wit-pxeboot/initramfs.gz + linux /wit-pxeboot/vmlinuz-amd64 console=tty0 console=ttyS1,115200n8 size=5000 + initrd /wit-pxeboot/initramfs-amd64.gz } menuentry "debcore-arm64" { - linux /wit-pxeboot-arm/vmlinuz console=tty0 console=ttyAMA0,115200n8 size=5000 - initrd /wit-pxeboot-arm/initramfs.gz + linux /wit-pxeboot/vmlinuz-arm64 console=tty0 console=ttyAMA0,115200n8 size=5000 + initrd /wit-pxeboot/initramfs-arm64.gz } menuentry "install-x86_64" { - linux /wit-pxeboot/vmlinuz console=tty0 console=ttyS1,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export INSTALLEXTRA=wit-config; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1' - initrd /wit-pxeboot/initramfs.gz + linux /wit-pxeboot/vmlinuz-amd64 console=tty0 console=ttyS1,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export INSTALLEXTRA=wit-config; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1' + initrd /wit-pxeboot/initramfs-amd64.gz } menuentry "install-arm64" { - linux /wit-pxeboot-arm/vmlinuz console=tty0 console=ttyAMA0,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export INSTALLEXTRA=wit-config; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1' - initrd /wit-pxeboot-arm/initramfs.gz + linux /wit-pxeboot/vmlinuz-arm64 console=tty0 console=ttyAMA0,115200n8 size=5000 execstartup='sleep 60; export LANG=C; export DEBIAN_FRONTEND=noninteractive; export INSTALLEXTRA=wit-config; apt-get update && apt-get install -y wit-localinstaller && /usr/bin/create_local_install.sh || exit 1' + initrd /wit-pxeboot/initramfs-arm64.gz } #