diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | AdelieTux.icns | bin | 0 -> 85381 bytes | |||
| -rwxr-xr-x | build-cd | 80 | ||||
| -rw-r--r-- | bzImage-x86 | bin | 7517968 -> 0 bytes | |||
| -rw-r--r-- | bzImage-x86_64 | bin | 5801600 -> 0 bytes |
5 files changed, 70 insertions, 12 deletions
@@ -2,4 +2,6 @@ cdroot-*/ initrd-* squashroot-*/ +CHECKSUMS.* + *.iso diff --git a/AdelieTux.icns b/AdelieTux.icns Binary files differnew file mode 100644 index 0000000..5ffa840 --- /dev/null +++ b/AdelieTux.icns @@ -1,7 +1,6 @@ #!/bin/sh def_arch=$(uname -m) -def_kernel=4.4 declare -r PROGNAME=$(basename $0) @@ -59,9 +58,9 @@ ensure_commands() { usage() { - printf 'usage: %s [-a ARCH] [-k KERNEL] [--help]\n\n' $PROGNAME + printf 'usage: %s [-a ARCH] [-f|--full] [--help]\n\n' $PROGNAME printf 'Create an Adélie Linux CD image (.ISO) using the specified parameters.\n' - printf 'Default ARCH: %s\nDefault kernel version: %s\n' $def_arch $def_kernel + printf 'Default ARCH: %s\n' $def_arch } @@ -75,10 +74,10 @@ while [ -n "$1" ]; do usage exit ;; - -k | --kernel) - shift - declare -r MY_KERNEL=$1 - ;; + -f | --full) + shift + declare -r DO_FULL=full + ;; *) usage >&2 exit -1 @@ -88,7 +87,6 @@ while [ -n "$1" ]; do done declare -r ARCH=${MY_ARCH:-$def_arch} -declare -r KERNEL=${MY_KERNEL:-$def_kernel} declare -r LDARCH=${LDARCH:-$ARCH} ensure_commands @@ -108,10 +106,35 @@ mkdir cdroot-$ARCH mkdir initrd-$ARCH mkdir squashroot-$ARCH +declare -r PACKAGES=" + shadow \ + libffi \ + adelie-base \ + bash \ + openrc openrc-openrc \ + hwids eudev udev-init-scripts-openrc \ + parted \ + lvm2-openrc \ + easy-kernel easy-kernel-modules easy-kernel-firmware genkernel \ + dhcpcd net-tools \ + ca-certificates \ + rfkill wireless-tools wpa_supplicant \ + pciutils libusb1 usbutils \ + strace \ + hdparm \ + dmidecode \ + less \ + bzip2 \ + netifrc netifrc-doc netifrc-openrc \ + diskdev_cmds exfat-utils hfsutils mtools \ + efibootmgr elilo mactel-boot syslinux +" + printf '\033[01;32m * \033[37mInstalling base system to squash root...\033[00;39m\n' -apk --arch $ARCH -X "https://distfiles.adelielinux.org/adelie/1.0-alpha/$EXTRA_MIRROR" -U --allow-untrusted --root squashroot-$ARCH --initdb add shadow libffi adelie-base bash openrc openrc-openrc hwids eudev udev-init-scripts-openrc parted lvm2-openrc easy-kernel-modules easy-kernel-firmware dhcpcd net-tools ca-certificates rfkill wireless-tools mkdir -p squashroot-$ARCH/etc/apk/keys +cp 'packages@adelielinux.org.pub' squashroot-$ARCH/etc/apk/keys/ +apk --arch $ARCH -X "https://distfiles.adelielinux.org/adelie/1.0-alpha/$EXTRA_MIRROR" -U --root squashroot-$ARCH --initdb add $PACKAGES mkdir -p squashroot-$ARCH/home/live mkdir squashroot-$ARCH/target mkdir -p squashroot-$ARCH/media/live @@ -121,7 +144,6 @@ echo 'hostname="adelie"' > squashroot-$ARCH/etc/conf.d/hostname echo 'mtab_is_file=no' > squashroot-$ARCH/etc/conf.d/mtab cp -RPp squashroot-$ARCH/usr/share/openrc/runlevels squashroot-$ARCH/etc/runlevels -cp 'packages@adelielinux.org.pub' squashroot-$ARCH/etc/apk/keys/ ln -s /etc/init.d/udev squashroot-$ARCH/etc/runlevels/sysinit/udev ln -s /etc/init.d/udev-trigger squashroot-$ARCH/etc/runlevels/sysinit/udev-trigger ln -s /etc/init.d/lvmetad squashroot-$ARCH/etc/runlevels/sysinit/lvmetad @@ -140,8 +162,12 @@ FSTAB cat >squashroot-$ARCH/etc/passwd <<- PASSWD root:x:0:0:Charlie Root:/root:/bin/bash man:x:13:15:man-db:/usr/share/man:/sbin/nologin + sshd:x:22:22:SSH daemon:/var/empty:/sbin/nologin at:x:25:25:at:/var/spool/at/atjobs:/sbin/nologin fcron:x:101:206:fcron:/dev/null:/sbin/nologin + messagebus:x:103:203:DBus unprivileged user:/dev/null:/sbin/nologin + polkit:x:104:202:PolicyKit unprivileged user:/dev/null:/sbin/nologin + rtkit:x:105:200:RTKit unprivileged user:/dev/null:/sbin/nologin postfix:x:207:207:postfix:/var/spool/postfix:/sbin/nologin live:x:1000:1000:Live User:/home/live:/bin/bash PASSWD @@ -153,18 +179,31 @@ cat >squashroot-$ARCH/etc/group <<- GROUP mail:x:12:postfix uucp:x:14: cron:x:16: + audio:x:18: + sshd:x:22: at:x:25: + rtkit:x:200: + plugdev:x:201: + polkitd:x:202: + messagebus:x:203: + input:x:205: fcron:x:206: postfix:x:207: postdrop:x:208: + postmaster:x:249: + utmp:x:406: live:x:1000: GROUP cat >squashroot-$ARCH/etc/shadow <<- SHADOW root:::::::: man:::::::: + sshd:::::::: at:::::::: fcron:::::::: + messagebus:::::::: + polkit:::::::: + rtkit:::::::: postfix:::::::: live:::::::: SHADOW @@ -192,6 +231,21 @@ ISSUE chmod 600 squashroot-$ARCH/etc/shadow +if test -n "${DO_FULL+full}"; then + declare -r PACKAGES_DIR=squashroot-$ARCH/packages/$ARCH + mkdir -p $PACKAGES_DIR + apk --arch $ARCH --root squashroot-$ARCH fetch -o $PACKAGES_DIR $(apk --root squashroot-$ARCH info) + if test -n "${SIGNING_KEY+use_key}"; then + apk index -o .tmp.APKINDEX.unsigned.tar.gz $PACKAGES_DIR/*.apk + openssl dgst -sha256 -sign $SIGNING_KEY -out .SIGN.RSA.packages\@adelielinux.org.pub .tmp.APKINDEX.unsigned.tar.gz + tar cf .tmp.signature.tar .SIGN.RSA.packages\@adelielinux.org.pub + cat .tmp.signature.tar | abuild-tar --cut | gzip -9 > .tmp.signature.tar.gz + cat .tmp.signature.tar.gz .tmp.APKINDEX.unsigned.tar.gz > .tmp.APKINDEX.tar.gz + rm .tmp.APKINDEX.unsigned.tar.gz .tmp.signature.tar.gz .tmp.signature.tar .SIGN.RSA.packages\@adelielinux.org.pub + mv .tmp.APKINDEX.tar.gz $PACKAGES_DIR/APKINDEX.tar.gz + fi +fi + printf '\033[01;32m * \033[37mCreating compressed file system image...\033[00;39m\n' mksquashfs squashroot-$ARCH cdroot-$ARCH/adelie.squashfs @@ -234,6 +288,8 @@ cp squashroot-$ARCH/etc/udev/hwdb.bin initrd-$ARCH/etc/udev/ # init cp cdinit-$ARCH initrd-$ARCH/init +cp AdelieTux.icns cdroot-$ARCH/.VolumeIcon.icns + printf '\033[01;32m * \033[37mCompressing initrd...\033[00;39m\n' pushd initrd-$ARCH @@ -244,7 +300,7 @@ mv cdroot-$ARCH/initrd.gz cdroot-$ARCH/initrd printf '\033[01;32m * \033[37mAdding kernel...\033[00;39m\n' -cp bzImage-$ARCH cdroot-$ARCH/bzImage +cp squashroot-$ARCH/boot/vmlinuz* cdroot-$ARCH/bzImage printf '\033[01;32m * \033[37mInstalling ISOLINUX...\033[00;39m\n' @@ -264,4 +320,4 @@ cp /usr/share/syslinux/ldlinux.c32 cdroot-$ARCH/isolinux/ printf '\033[01;32m * \033[37mCreating the CD...\033[00;39m\n' -mkisofs -o adelie-live-$ARCH-1.0-ALPHA-$(date +%Y%m%d).iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -joliet cdroot-$ARCH +mkisofs -o adelie-${DO_FULL:-live}-$ARCH-1.0-ALPHA2-$(date +%Y%m%d).iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -joliet -rational-rock -V "Adélie 1.0a2 $ARCH" cdroot-$ARCH diff --git a/bzImage-x86 b/bzImage-x86 Binary files differdeleted file mode 100644 index 962b490..0000000 --- a/bzImage-x86 +++ /dev/null diff --git a/bzImage-x86_64 b/bzImage-x86_64 Binary files differdeleted file mode 100644 index aa649ee..0000000 --- a/bzImage-x86_64 +++ /dev/null |