Remove old stuff, rewrite docs

31 files changed, 38 insertions, 755 deletions

diff --git a/AdelieTux.icns b/AdelieTux.icns
deleted file mode 100644
index 5ffa840..0000000
--- a/AdelieTux.icns
+++ /dev/null
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 9761579..26e3bd3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -6,7 +6,7 @@
 :Status:
   Final
 :Copyright:
-  © 2016 Adélie Linux.  NCSA open source licence.
+  © 2016-2023 Adélie Linux Team.  NCSA open source licence.
 
 
 
@@ -20,16 +20,13 @@ Release Engineering team to create the official Adélie Linux ISO images.
 License
 ```````
 The tools contained in this repository are licensed under the NCSA open source
-license.  The bzImage files are created from the ``sys-kernel/easy-kernel``
-package (the ``/boot/vmlinuz`` file created for each architecture is copied
-unchanged to ``bzImage-${ARCH}``), and as such are licensed under the kernel's
-GPL2 license.
+license.
 
 Changes
 ```````
 Any changes to this repository must be reviewed before being pushed to the
-master branch.  There are no exceptions to this rule.  For security-sensitive
-updates, contact the Security Team at sec-bugs@adelielinux.org.
+current branch.  There are no exceptions to this rule.  For security-sensitive
+updates, contact the Security Team.
 
 
 
diff --git a/README.rst b/README.rst
index 665a222..783602a 100644
--- a/README.rst
+++ b/README.rst
@@ -8,7 +8,7 @@
 :Status:
   Production
 :Copyright:
-  © 2018 Adélie Linux Team.  NCSA open source licence.
+  © 2018-2023 Adélie Linux Team.  NCSA open source licence.
 
 
 
@@ -21,16 +21,13 @@ Release Engineering team to create the official Adélie Linux ISO images.
 License
 ```````
 The tools contained in this repository are licensed under the NCSA open source
-license.  The bzImage files are created from the ``system/easy-kernel``
-package (the ``/boot/vmlinuz`` file created for each architecture is copied
-unchanged to ``bzImage-${ARCH}``), and as such are licensed under the kernel's
-GPL2 license.
+license.
 
 Changes
 ```````
 Any changes to this repository must be reviewed before being pushed to the
-master branch.  There are no exceptions to this rule.  For security-sensitive
-updates, contact the Security Team at sec-bugs@adelielinux.org.
+current branch.  There are no exceptions to this rule.  For security-sensitive
+updates, contact the Security Team.
 
 
 
@@ -41,39 +38,45 @@ Usage
 This section contains usage information for the software in this repository.
 
 
-``adelie-build-cd``
-```````````````````
+Using ``hscript-image`` to generate an image
+````````````````````````````````````````````
 
-This script is where the magic happens.  ``adelie-build-cd`` will create the ISO for
-the architecture specified (defaulting to the currently running system
-architecture if not specified).
+The ``configs/`` directory contains the HorizonScript files that describe the
+media you can create.  All configurations eventually inherit from the
+``base/base.installfile`` HorizonScript.
 
-``adelie-build-cd`` requires the following utilities to be installed on your computer:
+Each architecture supported for image creation has an entry in ``arch`` used
+for all media created for that architecture.
+
+The main targets used are typically:
+
+* ``live/$ARCH-kde.installfile``: Live KDE media
+* ``live/$ARCH-lxqt.installfile``: Live LXQt media
+* ``live/$ARCH-mate.installfile``: Live MATE media
+* ``horizon/$ARCH-horizon.installfile``: Installation media
+* ``horizon/$ARCH-horizon-fw.installfile``: Installation media
+  (with non-libre firmware)
+
+``hscript-image`` requires the following utilities to be installed:
 
 * apk-tools
-* cpio
 * squashfs-tools
-* A variant of ``mkisofs`` - releng uses the cdrkit package.
+* xorriso
 
-``adelie-build-cd`` is run on the Z shell on official releng machines, but should be
-functional in any POSIX compliant shell; it relies on no non-POSIX shell
-constructs.
+Typically, ``hscript-image`` is run in the following way to generate,
+for example, KDE media::
 
-The ``cdinit-${ARCH}`` file must exist in the directory that you run
-``adelie-build-cd``; it does not need to be in the same directory as the ``adelie-build-cd``
-script itself.
+    hscript-image -t iso -o adelie-$RELEASE-$ARCH-kde.iso configs/live/$ARCH-kde.installfile
 
 
-``cdinit``
-``````````
+How CDs work
+````````````
 
-This functions as early init for the CD, probing for the SquashFS root and
-mounting it appropriately.  Pre-compiled binaries statically linked to the
-current release's version of musl, util-linux, and eudev are provided for each
-Tier I and Tier II architecture of the current release.
+See the comprehensive documentation on Horizon's ISO target in that repository.
+As a cheat-sheet:
 
-You may build your own ``cdinit``, for verification purposes or for another
-architecture, and place it in the same directory as you invoke ``adelie-build-cd``.
+* ``-b issue-path=/path/to/issue/file`` - override ``/etc/issue`` on CD
+* ``-b iso-params=foo`` - append ``foo`` to ``xorriso`` parameter
 
 
 
@@ -83,7 +86,7 @@ Reporting Issues
 If you have issues installing with the official media, you should report your
 issue to `the BTS`_.
 
-If you have issues running ``adelie-build-cd`` or compiling ``cdinit``, you may file
-an issue in the GitLab repository.
+If you have issues with generating your own media, or want to discuss other
+media types, please contact the development team.
 
 .. _the BTS: http://bts.adelielinux.org/
diff --git a/cdinit-pmmx b/cdinit-pmmx
deleted file mode 100755
index c59bcfb..0000000
--- a/cdinit-pmmx
+++ /dev/null
diff --git a/cdinit-ppc b/cdinit-ppc
deleted file mode 100755
index f98d2c4..0000000
--- a/cdinit-ppc
+++ /dev/null
diff --git a/cdinit-ppc64 b/cdinit-ppc64
deleted file mode 100755
index 1e5dcdb..0000000
--- a/cdinit-ppc64
+++ /dev/null
diff --git a/cdinit-x86 b/cdinit-x86
deleted file mode 100755
index e4df83e..0000000
--- a/cdinit-x86
+++ /dev/null
diff --git a/cdinit-x86_64 b/cdinit-x86_64
deleted file mode 100755
index 366dc48..0000000
--- a/cdinit-x86_64
+++ /dev/null
diff --git a/cdinit.c b/cdinit.c
deleted file mode 100644
index f5ccb22..0000000
--- a/cdinit.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * cdinit - start up udev, find the squashfs, and get the hell out of dodge
- * Copyright (c) 2016-2018 Adélie Linux Team.  All rights reserved.
- * Licensed under the NCSA open source license.
- * See LICENSE file included with this source for more information.
- */
-
-
-#include <errno.h>	/* errno */
-#include <fcntl.h>	/* ioctl */
-#include <linux/loop.h>	/* LOOP_SET_FD */
-#include <stdbool.h>	/* bool */
-#include <stdio.h>	/* stderr, fprintf */
-#include <stdlib.h>	/* EXIT_FAILURE */
-#include <string.h>	/* strlen */
-#include <sys/mount.h>	/* mount */
-#include <sys/stat.h>	/* mkdir */
-#include <sys/wait.h>	/* waitpid, W* macros */
-#include <unistd.h>	/* exec, fork, etc */
-
-#include <blkid/blkid.h>/* blkid_get_tag_value */
-#include <libudev.h>	/* udev* */
-
-
-/*!
- * @brief Grab a parameter out of /proc/cmdline, if it is set.
- * @param param		The parameter you wish to read.
- * @param def		The default value if no value is set (or NULL).
- * @returns The value of the parameter as set in /proc/cmdline, or
- *          the value of `default` if no value is set.
- * @note If a parameter is passed on the command line but has no value
- *       (ex: 'debug'), its value will not be returned.
- */
-const char *get_param(const char *param, const char *def)
-{
-	char *str = getenv(param);
-	return str ? str : def;
-}
-
-/*!
- * @brief Invoke a specified command.  Return if it is run successfully.
- * @param command	User-readable description of what command is to run.
- * @param path		The full on-disk path to the executable to run.
- * @param argv		The full argument list to run.
- * @returns true if command runs successfully, false otherwise.
- */
-bool cdi_invoke(const char *command, const char *path, char * const argv[])
-{
-	pid_t our_pid;
-
-	fprintf(stdout, " * Starting %s... ", command);
-
-	our_pid = fork();
-	if(our_pid == 0)
-	{
-		execv(path, argv);
-		fprintf(stderr, "could not start %s: %s\n", command,
-			strerror(errno));
-		return 255;
-	}
-	else if(our_pid == -1)
-	{
-		fprintf(stderr, "[ !! ] failed to fork: %s\n", strerror(errno));
-		return false;
-	}
-	else
-	{
-		int status, code;
-
-		waitpid(our_pid, &status, 0);
-		if(!WIFEXITED(status))
-		{
-			fprintf(stderr, "[ !! ] %s caught signal\n", command);
-			return false;
-		}
-
-		code = WEXITSTATUS(status);
-		if(code != 0)
-		{
-			fprintf(stderr, "[ !! ] %s exited with error code %d\n",
-				command, code);
-			return false;
-		}
-	}
-
-	fprintf(stdout, "[ ok ]\n");
-
-	return true;
-}
-
-/* We need to test each block device in the system, in case there are
- * multiple drives that all have media present.  We can narrow it down,
- * however:
- * 
- * - We know that our device will have the specified squashfs.
- * - We know it will be mountable without external helpers, as ISO9660,
- *   FAT, and HFS+ are built in to the kernel.
- */
-bool cdi_find_media(const char *squash_name)
-{
-	struct udev *udev;
-	struct udev_enumerate *dev_list;
-	struct udev_list_entry *first, *candidate;
-	struct udev_device *device = NULL;
-
-	udev = udev_new();
-	if(udev == NULL)
-	{
-		fprintf(stderr, "Cannot establish udev link.\n");
-		return false;
-	}
-
-	dev_list = udev_enumerate_new(udev);
-	if(dev_list == NULL)
-	{
-		fprintf(stderr, "Cannot create enumerator (memory?)\n");
-		return false;
-	}
-
-	udev_enumerate_add_match_subsystem(dev_list, "block");
-#ifdef DISKONLY		/* support booting off USB partition unless DISKONLY */
-	udev_enumerate_add_match_property(dev_list, "DEVTYPE", "disk");
-#endif
-	udev_enumerate_scan_devices(dev_list);
-
-	first = udev_enumerate_get_list_entry(dev_list);
-	if(first == NULL)
-	{
-		fprintf(stderr, "No block devices found.\n");
-		fprintf(stderr, "This system cannot boot Adélie Linux "
-				"without additional drivers.\n");
-		return false;
-	}
-
-	udev_list_entry_foreach(candidate, first)
-	{
-		const char *path = udev_list_entry_get_name(candidate);
-		char *fstype = NULL;
-
-		if(device != NULL)
-		{
-			udev_device_unref(device);
-		}
-		device = udev_device_new_from_syspath(udev, path);
-		errno = 0;
-
-		const char *dev_node = udev_device_get_devnode(device);
-		if(dev_node == NULL)
-		{
-			continue;	/* worthless */
-		}
-
-		if((fstype = blkid_get_tag_value(NULL, "TYPE", dev_node)) == NULL)
-		{
-#ifdef DEBUG
-			fprintf(stderr, "cdi_find_media: %s: unknown FS\n",
-				dev_node);
-#endif
-			continue;
-		}
-
-		if(mount(dev_node, "/media", fstype, MS_RDONLY, NULL) != 0)
-		{
-			fprintf(stderr, "cdi_find_media: mounting %s:"
-					" %s\n", dev_node, strerror(errno));
-			free(fstype);
-			continue;
-		}
-		free(fstype);
-
-		if(chdir("/media") != 0)
-		{
-			fprintf(stderr, "cdi_find_media: error accessing %s:"
-					" %s\n", dev_node, strerror(errno));
-			umount("/media");
-			continue;
-		}
-		if(faccessat(AT_FDCWD, squash_name, F_OK, 0) != 0)
-		{
-#ifdef DEBUG
-			fprintf(stderr, "cdi_find_media: %s: system not found:"
-					" %s\n", dev_node, strerror(errno));
-#endif
-			chdir("/");
-			umount("/media");
-			continue;
-		}
-
-#ifdef DEBUG
-		fprintf(stderr, "cdi_find_media: LiveFS located at %s\n",
-			dev_node);
-#endif
-
-		int squash_fd = openat(AT_FDCWD, squash_name, O_RDONLY);
-		if(squash_fd == -1)
-		{
-			chdir("/");
-			umount("/media");
-			continue;
-		}
-
-		int dev_fd = open("/dev/loop4", O_RDWR);
-		if(dev_fd == -1)
-		{
-			close(squash_fd);
-			chdir("/");
-			umount("/media");
-			continue;
-		}
-
-		ioctl(dev_fd, LOOP_SET_FD, squash_fd);
-		close(squash_fd);
-
-		if(mount("/dev/loop4", "/lowerroot", "squashfs", MS_RDONLY,
-			NULL) != 0)
-		{
-#ifdef DEBUG
-			fprintf(stderr, "cdi_find_media: %s contained invalid"
-					" LiveFS image: %s\n", dev_node,
-					strerror(errno));
-#endif
-			ioctl(dev_fd, LOOP_CLR_FD, 0);
-			close(dev_fd);
-			chdir("/");
-			umount("/media");
-			continue;
-		}
-
-		close(dev_fd);
-		chdir("/");
-		udev_device_unref(device);
-		device = NULL;
-		break;
-	}
-
-	udev_enumerate_unref(dev_list);
-	udev_unref(udev);
-
-	return (access("/lowerroot/sbin/init", F_OK) == 0);
-}
-
-
-
-int main(void)
-{
-	pid_t our_pid;
-	const char *squash;
-	bool found = false;
-	unsigned char tries = 4;
-
-#ifndef DEBUG
-	if(getpid() != 1)
-	{
-		fprintf(stderr, "This application can only boot live media.\n");
-		return EXIT_FAILURE;
-	}
-#endif
-
-	fprintf(stdout, " * Adélie Linux is starting up...\n\n");
-
-	if(mount("none", "/dev", "devtmpfs", 0, NULL) != 0)
-	{
-		fprintf(stderr, "FATAL: Can't mount devtmpfs at /dev: %s\n",
-			strerror(errno));
-		return EXIT_FAILURE;
-	}
-
-	if(mount("none", "/proc", "proc", 0, NULL) != 0)
-	{
-		fprintf(stderr, "FATAL: Can't mount early /proc: %s\n",
-			strerror(errno));
-		return EXIT_FAILURE;
-	}
-
-	if(mount("none", "/sys", "sysfs", 0, NULL) != 0)
-	{
-		fprintf(stderr, "FATAL: Can't mount early /sys: %s\n",
-			strerror(errno));
-		return EXIT_FAILURE;
-	}
-
-	/* Our entire goal for this system is to be small and fast, in both
-	 * execution and code.  This is not the place for bloat and this is not
-	 * the place to do a tech demo of some shiny new API.
-	 * 
-	 * Installers and rescue media must be very stable.  The less surface
-	 * this system has, the less can go wrong.
-	 * 
-	 * As we are pid1, we first need to start up udev.
-	 */
-	{
-		char * const argv[] = {"udevd", "--daemon",
-#ifdef DEBUG
-				      "--debug",
-#endif
-				      "--event-timeout=30",
-				      "--resolve-names=never",
-				      (char *)0};
-		if(!cdi_invoke("early udevd", "/sbin/udevd", argv))
-		{
-			return EXIT_FAILURE;
-		}
-	}
-
-	/* udev is started.  Now we need to communicate.
-	 * 
-	 * First, we trigger block device uevents.  This will ensure that all
-	 * block devices supported by the kernel have /dev entries that we can
-	 * use.
-	 */
-	{
-		char * const argv[] = {"udevadm", "trigger", "--action=add",
-				       "--subsystem-match=blocK", 0};
-		if(!cdi_invoke("block uevents", "/sbin/udevadm", argv))
-		{
-			return EXIT_FAILURE;
-		}
-	}
-
-	/* Figure out what our squashfs is named. */
-	squash = get_param("squashroot", "adelie.squashfs");
-
-	/* Now we need to iterate over the available block devices, trying to
-	 * find our CD media.
-	 */
-	found = cdi_find_media(squash);
-	while(!found && tries--)
-	{
-		found = cdi_find_media(squash);
-		fprintf(stderr, "Attempting to acquiesce...\n");
-		sleep(5);
-	}
-
-	if(!found)
-	{
-		fprintf(stderr, "FATAL: no boot media found\n");
-		return EXIT_FAILURE;
-	}
-
-	{
-		char * const argv[] = {"udevadm", "control", "-e", 0};
-		cdi_invoke("clean up", "/sbin/udevadm", argv);
-	}
-
-	/* Create our OverlayFS mount, so everything is writable.
-	 * TODO: USB-based persistence
-	 */
-	if(mount("tmpfs", "/upperroot", "tmpfs", 0, NULL) != 0)
-	{
-		fprintf(stderr, "FATAL: could not mount tmpfs: %s\n",
-			strerror(errno));
-		return EXIT_FAILURE;
-	}
-
-	/* If this fails, we'll find out below */
-	mkdir("/upperroot/.overlay_work", S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
-	mkdir("/upperroot/.root", S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
-
-	if(mount("overlay", "/newroot", "overlay", 0,
-		 "lowerdir=/lowerroot,"
-		 "upperdir=/upperroot/.root,"
-		 "workdir=/upperroot/.overlay_work") != 0)
-	{
-		fprintf(stderr, "FATAL: could not mount overlayfs: %s\n",
-			strerror(errno));
-		return EXIT_FAILURE;
-	}
-
-	mount("/dev", "/newroot/dev", NULL, MS_MOVE, NULL);
-	mount("/media", "/newroot/media/live", NULL, MS_MOVE, NULL);
-	mount("/proc", "/newroot/proc", NULL, MS_MOVE, NULL);
-	mount("/sys", "/newroot/sys", NULL, MS_MOVE, NULL);
-
-	chdir("/newroot");
-	if(mount("/newroot", "/", NULL, MS_MOVE, NULL) != 0)
-	{
-		fprintf(stderr, "FATAL: could not pivot to /newroot: %s\n",
-			strerror(errno));
-		return EXIT_FAILURE;
-	}
-
-	chroot(".");
-	execl("/sbin/init", "init", (char *)0);
-
-	fprintf(stderr, "Going nowhere without my new root's init\n");
-	return EXIT_FAILURE;
-}
diff --git a/iso-params-pmmx b/iso-params-pmmx
deleted file mode 100644
index eb13688..0000000
--- a/iso-params-pmmx
+++ /dev/null
@@ -1 +0,0 @@
---grub2-boot-info --grub2-mbr /usr/lib/grub/i386-pc/boot_hybrid.img -eltorito-boot boot/grubcore.img -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog boot/grub.cat -isohybrid-gpt-basdat --efi-boot efi.img -efi-boot-part --efi-boot-image -hfsplus -apm-block-size 2048 -hfsplus-file-creator-type chrp tbxj /System/Library/CoreServices/.disk_label -hfs-bless-by i /System/Library/CoreServices/boot.efi
diff --git a/iso-params-ppc b/iso-params-ppc
deleted file mode 100644
index 8c4c1e2..0000000
--- a/iso-params-ppc
+++ /dev/null
@@ -1 +0,0 @@
--hfsplus -isohybrid-apm-hfsplus -hfsplus-file-creator-type chrp tbxi boot/ofboot.b -hfs-bless-by p boot -sysid PPC -chrp-boot-part
diff --git a/iso-params-ppc64 b/iso-params-ppc64
deleted file mode 100644
index 8c4c1e2..0000000
--- a/iso-params-ppc64
+++ /dev/null
@@ -1 +0,0 @@
--hfsplus -isohybrid-apm-hfsplus -hfsplus-file-creator-type chrp tbxi boot/ofboot.b -hfs-bless-by p boot -sysid PPC -chrp-boot-part
diff --git a/iso-params-x86_64 b/iso-params-x86_64
deleted file mode 100644
index b74a6e7..0000000
--- a/iso-params-x86_64
+++ /dev/null
@@ -1 +0,0 @@
---grub2-boot-info --grub2-mbr /usr/lib/grub/i386-pc/boot_hybrid.img -eltorito-boot boot/grubcore.img -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog boot/grub.cat -no-emul-boot -isohybrid-gpt-basdat --efi-boot efi.img -efi-boot-part --efi-boot-image -hfsplus -apm-block-size 2048 -hfsplus-file-creator-type chrp tbxj /System/Library/CoreServices/.disk_label -hfs-bless-by i /System/Library/CoreServices/boot.efi
diff --git a/keys/arm64-1@packages.adelielinux.org.pub b/keys/arm64-1@packages.adelielinux.org.pub
deleted file mode 100644
index 8bafca2..0000000
--- a/keys/arm64-1@packages.adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3qokI0/9FAiN5PrOnoRO
-bDJV6kTuNz+KBFBU1hAK+EzeklTxtBDQlefYcc9VzMBCopUMC2jLb3qNligmTl+y
-gUzfv/Ftb9G3DPn598B5Eap0AFctqqk9oS5x1C4tkl9ID3FR/qTNCIRBFLZbdNMv
-w91GedBVc4pGXQbZr3TRIpEIyhlsRdmQLlc3aqkBDdG5X1WT8KcOXWdx/SsRcwFg
-xsiVeCtnGxC0HWWxsDKbdAl2mhv/DqdL7ZXDBFIWlXJuKUjGCLG3+yE2dueLIY/i
-BT1vRL2qlLwcX9yxEYnNmQACIB+xAgfI7Z3z4+tq4sACcs61MJGm3C2xODT/Wm/4
-nNbp/rQ5lystHK6dwN1MeHPBcPZM2S6BhnvTJLzlmEKmMOaz7B6bq0QBFhgqt4U3
-9/s2W2mazvNVxF35GPzXBh3Viv4URdJ7Q/DB5Igf/lKcrcTlupKKpVh0i6oJvu5s
-pYMwLIQ+ySNubLl2sTHiSS4PoazP6vMEEDx03oLy3qwyUlnRwi+MCqhjNxyJMBc4
-zZZ4QafUYm+rR8GrP0Rd9b6jcVuE64U9xNWr1HEzYXjy0VHgXhq1sSbei6PX9n1j
-sPO/MjjQUQEmFy+dBlCwK3d9WxRi80z+qdhbhJ4U0jpElkR0vsBHi/kHjOUs5lDa
-k5+Hr4b2dBu8M6YShUGyhjcCAwEAAQ==
------END PUBLIC KEY-----
diff --git a/keys/arm64-2@packages.adelielinux.org.pub b/keys/arm64-2@packages.adelielinux.org.pub
deleted file mode 100644
index 50fffb0..0000000
--- a/keys/arm64-2@packages.adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApUEZcMLTlLoH/CvA1ZsU
-H1z4udxYSw/2yrAFwJNoa1juTkaw0p46ZeI5XBA+Cx/qj7IORS1XLdFEnl0o17Jp
-rZ6K31U2M9BOdCI5f40AY+bpKFj84fGjbsP65xaWTVf1ahuQSXKjBANSPPBekoFA
-7NlaWBzU2WWXA9QZeUgElktPIMUnHf4YvToBEkIrSb31cqEOYRubmkDsvibA+3YY
-MGX48LWDRwOr6Y9051QPR18e464bjG+qLaSrKAnTi+gcH1MZsnKhRUTZZQVwCpmS
-39eyfmLeH2QomGjr5jOTMLmzXB3rPRCdxfHsK0gBqs/kVrNQWOTl0Bhyx26nmHMf
-7IEQI3WkQbUNZA1wXH2qIYpFic28V1YRIa6Hp+AhHGKHzvomAJ24n5HVCioDwicO
-HzU/2lwd0eFZ236DcW/qtCh+IiqcVCA1ggRCANwalh519edoKQQGaVhgB809zoBt
-Vrb9hsckCbAJa/MQs5paBr8dc4EU9GT04Z1Xx2JRfgWfKsJF3i0mmXqG33TOW/Bv
-jAcQVxGYTpb15GePtIf3eOcnU0DdHd3YS+EqMYuGOU121pEOh2+/tSa99SY8PNdm
-C91Wx40eioT2UFqJHOd0Q6hgEA+win+LR29LPi6c8cVkzsmOsJxMEsFKd3kIre9Y
-Hk/XLs/3s9qsBrd8Q4estm8CAwEAAQ==
------END PUBLIC KEY-----
diff --git a/keys/armv7-1@packages.adelielinux.org.pub b/keys/armv7-1@packages.adelielinux.org.pub
deleted file mode 100644
index 49d97b0..0000000
--- a/keys/armv7-1@packages.adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAso0/LbLfyWTiyr/wQeg5
-3m2o73jDtGuO9JceTbpp+UeKAleVnEO9jtiTSEqkTMHsz9qij6ssgUPAIjoyXVLR
-b9jcds/+whmn8XfeVdK8kpqpsik35XKnUJSRuZxxoWVnG5dxv/MEllednD4Qgv7u
-r3Xo318ND96KpTnIwCWuxwG83/r8fYA7UkAwg3d+EksXk9G2I1PH9tv5Vzm8Axmq
-EVKn0a/vZGEPZ7XGBNW2ZDLf6JnWhj6rxUdFiK7wXBr1P+v9IZf3iP/g0c5MKngg
-N04Gv9gKdVe84rVayJswEqIRpmgWrjj96Q/V/znW2saiG1FJvLVDAQvNYDTSrOY1
-4Vl1ZEgVWYy5yqBLJYT6/GJRNzCK2GY+TYZnvpcapgiul9wSebmhHAn3WLXvAfc/
-hrGYtsWnc62RX3c5wR66a9WCEneP+Zcb/W+X4wBaUOh9dwaCmkxvP4MJeI6RE97q
-GZK8LHEmay1Yuo1YAm7pKm1PKYc34rSDB9OMxibh0MLHBP22tLaS8CI9tdHoCL4k
-eN2OAIl//j+pvpb2SmUrE/sYbfosGAE6dB95//VifZPTctPKXoZ1BCAWMcufXj0s
-ZtfVUx4wfRDPgBmBZHhcYwWZhwj31LemoKA8ofwkO/nqu5ELCUzWNeI6wmelAYF5
-mGMdAvexncv9XfD0FkCLgjkCAwEAAQ==
------END PUBLIC KEY-----
diff --git a/keys/armv7-2@packages.adelielinux.org.pub b/keys/armv7-2@packages.adelielinux.org.pub
deleted file mode 100644
index c69fe92..0000000
--- a/keys/armv7-2@packages.adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0ysqkRKAHKlmgTuzOfUz
-8C51wOpJHNrJoQEFeg7j5Ov3AlbGeThqtdSJMkFJerKlpFRVpdCcGihgb8pezspn
-Zn5AFAwUnbsSKpfIc/Hy+rvlDda64TWeWX1wEeB82qSG5IOfwXLAv2pPXlFUEqdp
-eOxZuURO2aSFz4ea+CNDNlJQItLRQz/AS/IoCKFtOUw2eYkT8gPjxUnwccqS/Ol3
-zG+e4g8Ai3uvLmoH52sJEwZ67gdL8R4+EIvf185XDO3IWPp+aNtn5Q0SK4gJe5Ao
-2jGIHwTbmF42ZpsDp4/SOV/9spQBKoNpcutKrl0SKrH+37Dzjo/AabeIEWsWuJS4
-iiOk9rR2iRAYeXLa/653y70mTWgOUzJ2SKsFMTgwizJK+CcSkc7uWmE8PqXrzUQi
-5xLHS93bbB7pfC9PGY3Qar8l3fsVdx3l1RSuaTWYCl47GMgqeOIAz7+0PNArRzji
-yKl0RMC6aTfLjxWw4Nhx8aexZRLhD01W5HmfxUb6oReAZjoMPOGqWyB8FjNSz2mW
-1pqMYkiyT7iLMMnca19WMp9EbvOAV58PeevnAnBdAP2ALA7Nnnq70GboJ3V0lYdw
-Xupa9B0qg7PITKRCCztSsWk6XqpeZn+9OaPg/VewEa12v0qxG45xjTUwXBw6TkA5
-OImpHldSpXF7YxEauhJ6l08CAwEAAQ==
------END PUBLIC KEY-----
diff --git a/keys/powerpc-1@packages.adelielinux.org.pub b/keys/powerpc-1@packages.adelielinux.org.pub
deleted file mode 100644
index a8beee4..0000000
--- a/keys/powerpc-1@packages.adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzQnVSXABOLrSCbrNb7XJ
-M+4U3VtI0LKguIaQK2xtkzoL7z/kLGjg0vDrunPNyZooG78L9Sk/q1xKTBiHToV9
-n4XlELhYwh4jCucp7GIaTKZm91P9lB6RKnSl9SuB+snITeDAytASCMn0IVD4J5QJ
-jYgg4tRuLGI8w++xwkOdpOjbYGFGNrOIIRroA+EmBM8pJ5FEEPPUS4Gt9e1iLSf4
-n/d2wzEsbl0MQndHTFsWw1PW8LWTmq5IVbrZ99hswFGgH49HogImnnOKrRYBAy0g
-lIH8UZvHNqhiJ6cJ1cCj/Fh/5JLuemxZMiGT+xpkPMd2ih8b8Oou06zQTP1TMllO
-vsznHTtn8Mk25A84qx16Bpmn0hOObiEZWDAjsVvPrLDDx364sNmluK+vI2UlrFLp
-ReEyVJaMHMokE02ONZecLyOvMhTTSMRcPHTsrCr7RwvXx0edtoX3dypNAx2T5+le
-Dzi3ua+boduJXRdgkt3va7DQYNtzKlgkgOCBRO5guJe6ja537Sllb7K6eKiMgpJm
-n5RH7N1Vlrqn1NXKPQy5MH0d/y5rKXSbOKe48a9kZVIbiBaBMJkEusOwCFTUZuOj
-ZCMuR0VyHorEI5uMrppj7bY42QLVSQRDO8hsH25Oun5A84bjb/9oy5bRpvIGSKQH
-8fSqiLmgFw9qTDvg/soOm0ECAwEAAQ==
------END PUBLIC KEY-----
diff --git a/keys/powerpc-2@packages.adelielinux.org.pub b/keys/powerpc-2@packages.adelielinux.org.pub
deleted file mode 100644
index 7475039..0000000
--- a/keys/powerpc-2@packages.adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA76g0RV9GXThDu4sdvI4Q
-yKGHvg7m2khPWRMVE2D5Zf0I0UvZ5oKovuR2A9rECK9NAEj/2+cZkh9Jo4ll4obM
-4NFVh7fjUj9DNnfSaOL4gnXtnvma6DmDM5qmcP8++ueYqkTTcion8gr4BqNPflqW
-eQTdSTMkGBmekxmeK0CUvMOhRumPLVsEXanl13UM8yK/2747VUepuKvv4yLx4Cf5
-HMB7Ik9a0aHNcRY4sPOcyCcmrGFF1re7Dhh/gE/enKllC4sFYFPkpIh6pNmNxU50
-ur3FTHZHdm8e7XzkD1K2Sdb6CgXns6ZUpIOw/Yf1D3Dd2H1e7ZsA+2Vr2uB2aOEm
-H3pKMJZ6i0uOgacbUsA2oYxjHjKUIhHNsek8+/q7542DUBTqtbkPgxyc1sLpS5Ol
-0N4xNJX1CEnHGwcZOF3FLiR0AidnzrOBeYXEqYZqzJ0pXTybdrMydL2AJ3aUgKip
-ehvU6rbNl60h+OyPTUbfB/p9QRHG10578tCuXYnTAwVCkRe0qId8oRTRBDBkNa+K
-vVdJ4iLEhYgww3o9vJLRxegyuZjOcpvbWSEL+xGERI9iizA8zRA9kwnq/Zn8kljt
-mZb4GF9TgSnPUmgNW/ORMDbcZCmrLpwD5FCnNBTmVGyobEebRHmL3p5+5Ae5CRm9
-GlnlB4uFSRN1muWFxGCOfGUCAwEAAQ==
------END PUBLIC KEY-----
diff --git a/keys/x86-1@packages.adelielinux.org.pub b/keys/x86-1@packages.adelielinux.org.pub
deleted file mode 100644
index 0d8d7e2..0000000
--- a/keys/x86-1@packages.adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0H0IJ7fPzE05x3PUUzRt
-LE47qdSZV6C67EmomNjOdrJOaLmkoP/jwKjFRuogcAZBxmu51lvAcgYQFjcDO0jo
-ZcmcOcnRA4suBRfQCJYbI5p88SW8PKoKPLYhdNIY3e7KERT1qCCw6GyUlwievTsS
-n+t+EZiG+R2eBhMrb6byxTdU+au6yLDGfTm/Di4pa8uOoAGaLPEjOxP9dPPFgmhv
-t9/n+UsrfTwXcbP3WNkf5V9GuaQU8vjyPuRdSiId7viN2Rfh8ZETYXrpI+JyrnUc
-ruSJyvBIQyjetSMX6CjuRqKGkWLVZAgDUlxZIaKtaD7m+jgJ+i9DnvbF0hl7AS/X
-f9LCFNs+/dVlPiscD/JDzplBc2MCObs/dsO1b2bgF1iZWW5VljsuvA/0rhERAHNV
-EJmRrpTXLQkG3LLCIpJe093EGCVhn0ma9ErFZdpgkn5CLpVsJj3Q/ufxPMZBVU4w
-NBOh3FWXpGi8+B4absCkR2E6kE+o6pU9itMP4nLRf2CL9q/8KXt/55SHAaHxbrko
-wDEeIB6O25tKeVxuQvDzxe4YRYlFrOO4VE+5YUeX8f0ESt23cHVr+jQmoImoXm96
-CEuhG8pSEPwx7mlf3mOWkNgYQPusIIdgcXaDY18Df1KRrYP/x5jpBbGxtiZEILs+
-8FagnR4Z7xCj/wdFm8UZ6zkCAwEAAQ==
------END PUBLIC KEY-----
diff --git a/keys/x86-2@packages.adelielinux.org.pub b/keys/x86-2@packages.adelielinux.org.pub
deleted file mode 100644
index b3f3a40..0000000
--- a/keys/x86-2@packages.adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzBlRRdPuMHRlvsG04Yz+
-Ct8kU6mas28XIqnf6MtJ0xVgkoe8hfLtlR9zirdWRd2A3YoXfjgHKXkk6OsEeKc3
-au1xaKwvRwydqJ2yz6zZXoyxoY9z0w4VTLFeRj8YOacLqdeNbxgV4skGSKn+FePL
-XB1Vrl7rbYgw2JisuHWTWRFpHq5zSCNOnumwQqXehx08TjXb1QAvKyUwpIAbkFkc
-UBgxgSAkq48yCv2Nup8xRj3Vrh1cvit0Oy62gWxjhkv4mrkYKPVnaoSTDA5h/j5O
-hLTfwHngv9ntR2rPSuxA0syHM/5UQu/cVAumR6F8QhTDIbVhevxj/gZFbGDH0jFM
-+J4IL6U3/zJnj+q2PYXBrXgvafqfGlbU9gnBLTkMZxc9B0p9wN1GCr26HUtPRsEo
-6zH1SUuZAm3ds39uNQReg5RNNvptaEtwzB97XSGrGWhxhBq3dCZjAXnE/0OcoJeO
-AVfZ/vnCMIp2qKjOaC9doSbypFp0vzftRNke0KSC5x4n5yt6pc1bhPW4Sc6OXM9B
-1CEs68JwdOTwRsgDhtD5MFM0OA/wQHsEHPW4tp0pWUold+Dvi/EpfFPZaHE91ShQ
-nn0tIleySgY74VlRsW4wTwWsxmA0vySe1WYK5HG6zTjh8zkO4sf75uCGYuAj7Dsm
-F5BtoIl6djxpvvTwHh70OEMCAwEAAQ==
------END PUBLIC KEY-----
diff --git a/packages/arch/pmmx b/packages/arch/pmmx
deleted file mode 100644
index 01b1b70..0000000
--- a/packages/arch/pmmx
+++ /dev/null
@@ -1,5 +0,0 @@
-dmidecode
-efibootmgr
-grub-efi
-mactel-boot
-strace
diff --git a/packages/arch/ppc b/packages/arch/ppc
deleted file mode 100644
index 87a20f4..0000000
--- a/packages/arch/ppc
+++ /dev/null
@@ -1,2 +0,0 @@
-grub-ieee1275
-mac-fdisk
diff --git a/packages/arch/ppc64 b/packages/arch/ppc64
deleted file mode 100644
index 87a20f4..0000000
--- a/packages/arch/ppc64
+++ /dev/null
@@ -1,2 +0,0 @@
-grub-ieee1275
-mac-fdisk
diff --git a/packages/arch/x86_64 b/packages/arch/x86_64
deleted file mode 100644
index 01b1b70..0000000
--- a/packages/arch/x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-dmidecode
-efibootmgr
-grub-efi
-mactel-boot
-strace
diff --git a/packages/base b/packages/base
deleted file mode 100644
index 23418c8..0000000
--- a/packages/base
+++ /dev/null
@@ -1,54 +0,0 @@
-adelie-base-posix
-dash-binsh
-ssmtp
-s6-linux-init
-s6-linux-init-early-getty
-openrc
-eudev
-
-parted
-cryptsetup
-diskdev_cmds
-dosfstools
-e2fsprogs
-jfsutils
-lvm2
-mdadm
-xfsprogs-base
-
-easy-kernel
-easy-kernel-modules
-
-dracut
-
-ca-certificates
-curl
-dhcpcd
-iproute2
-iputils
-mtr
-net-tools
-netifrc
-netifrc-doc
-s6-dns
-traceroute
-
-iw
-wireless-tools
-wpa_supplicant
-
-hdparm
-pciutils
-pcmciautils
-smartmontools
-usbutils
-
-bzip2
-gnupg
-kbd-keymaps
-less
-links
-lzop
-nano
-openssh
-tmux
diff --git a/packages@adelielinux.org.pub b/packages@adelielinux.org.pub
deleted file mode 100644
index 8c05e1c..0000000
--- a/packages@adelielinux.org.pub
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsLRKBHGBE1L7QfwskILi
-/j1o04J6SUY+HDa6OcA96XpcBN8EA1rE3ThgUjasaTFbPkLXBt3/AnSW0uBGYDLj
-Wzg16dUYva3iV5W+Xc3oT0q2t0cCeYXgAUJyqw4SuyMypKLzvcb4mvUP8rDhJmee
-l9Rhw/0iEZF1S/ArTKZIaQ5bN3iAZG4IloiXTlwsjEGO6BWEemdTer7Z6wii8lW0
-b9dtivz0rxxb7wIrLPLB3HJz5X+FWniGs8TTNHymjhOxjq8A+kVMaElGfFhhNwBH
-W4rjlWiy16pTar49UVoJdD2L9WFNKD3JOARHjPUt5VPd0arbV5yztw8OjpbToF4W
-lNrT60sAvCIzW99U7QpKgWJX8F05zKcdJWSnyxLw0F8lN3vZ80dblKPYe3A/rj5E
-KNf4Lmach81YPNohL2hc9OgV8a474j7brA1gQlhVN0j55AQuTv/RrQpSlPcqCE4p
-e7l1Aa+daq8yH8sqAzfug1IqGgqztk/YoEcchprm+pEkWRI2N7qCU+3WKDF5Oa5M
-XQfPaOw7Mp6Udxl7Opwol4icNXYi3o4QX1I29ZmtcHsCPpunR8jwvEwauehbuH5i
-VL1rN77TOMMX+zXj02FP2wwURDo8D9YF0jUC8APt+ZVM4HFHUTzyEO+NvHa/24xK
-+QqStXcDCnLf1XN9+ORL3iUCAwEAAQ==
------END PUBLIC KEY-----
diff --git a/post/arch/pmmx.sh b/post/arch/pmmx.sh
deleted file mode 100755
index e86347d..0000000
--- a/post/arch/pmmx.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-mkdir -p cdroot-pmmx/boot
-
-if ! type grub-mkimage>/dev/null; then
-	printf "GRUB image cannot be created.  Using stale copy.\n"
-	printf "If you don't have one, this will fail!\n"
-else
-	printf '\033[01;32m * \033[37mInstalling GRUB...\033[00;39m\n'
-	grub-mkimage -c x86/early.cfg -v -p boot -o grubcore-stage1.img -O i386-pc biosdisk boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs linux ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs reboot gfxterm gfxterm_background gfxterm_menu all_video
-	cat /usr/lib/grub/i386-pc/cdboot.img grubcore-stage1.img > cdroot-pmmx/boot/grubcore.img
-
-	grub-mkimage -d squashroot-pmmx/usr/lib/grub/i386-efi -c x86/early.cfg -v -p boot -o x86/efi32.exe -O i386-efi boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu all_video
-fi
-
-cp x86/grub.cfg cdroot-pmmx/boot/grub.cfg
-
-mkdir -p cdroot-pmmx/System/Library/CoreServices
-touch cdroot-pmmx/System/Library/CoreServices/mach_kernel
-cat >cdroot-pmmx/System/Library/CoreServices/SystemVersion.plist <<PLIST
-<plist version="1.0">
-<dict>
-	<key>ProductBuildVersion</key>
-	<string>1B4</string>
-	<key>ProductName</key>
-	<string>Adélie Linux</string>
-	<key>ProductVersion</key>
-	<string>1.0-BETA4</string>
-</dict>
-PLIST
-cp disk-label cdroot-pmmx/System/Library/CoreServices/.disk_label
-echo 'Adélie 1.0-BETA4' >cdroot-pmmx/System/Library/CoreServices/.disk_label.contentDetails
-cp x86/efi32.exe cdroot-pmmx/System/Library/CoreServices/boot.efi
-
-if ! type mkfs.fat>/dev/null; then
-	printf "EFI image cannot be created.\n"
-	printf "If one does not already exist, this CD will boot BIOS systems only.\n"
-else
-	mkdir -p x86/efitemp
-	dd if=/dev/zero of=x86/efi32.img bs=1024 count=2880
-	mkfs.fat x86/efi32.img
-	mount -t vfat -o loop,rw x86/efi32.img x86/efitemp
-	mkdir -p x86/efitemp/EFI/BOOT
-	mv x86/efi32.exe x86/efitemp/EFI/BOOT/bootia32.efi
-	cp x86/efitemp/EFI/BOOT/bootia32.efi x86/efitemp/EFI/BOOT/boot.efi
-	umount x86/efitemp
-	rmdir x86/efitemp
-fi
-cp x86/efi32.img cdroot-pmmx/efi.img
-
diff --git a/post/arch/ppc.sh b/post/arch/ppc.sh
deleted file mode 100644
index 2c4fe64..0000000
--- a/post/arch/ppc.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir -p cdroot-ppc/boot
-
-if ! type grub-mkimage>/dev/null; then
-	echo "GRUB image cannot be created.  Using stale copy."
-	curl "https://distfiles.adelielinux.org/adelie/1.0-alpha/ppc/grubcore.img" > cdroot-ppc/boot/grubcore.img
-else
-	grub-mkimage -c ppc/early.cfg -v -p boot -o cdroot-ppc/boot/grubcore.img -O powerpc-ieee1275 boot btrfs datetime disk ext2 gfxmenu help hfs hfsplus ieee1275_fb iso9660 jfs ls luks lvm macbless macho nilfs2 ofnet part_apple part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu
-fi
-
-cp AdelieTux.icns 'cdroot-ppc/Icon
'
-cp ppc/grub.cfg cdroot-ppc/boot/grub.cfg
-cp ppc/ofboot.b cdroot-ppc/boot/ofboot.b
-cp cdroot-ppc/boot/ofboot.b cdroot-ppc/boot/bootinfo.txt
-
-# CHRP
-mkdir -p cdroot-ppc/ppc
-cp cdroot-ppc/boot/bootinfo.txt cdroot-ppc/ppc/bootinfo.txt
diff --git a/post/arch/ppc64.sh b/post/arch/ppc64.sh
deleted file mode 100755
index 9b98d0c..0000000
--- a/post/arch/ppc64.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-mkdir -p cdroot-ppc64/boot
-
-if ! type grub-mkimage>/dev/null; then
-	printf "GRUB image cannot be created.  Using stale copy.\n"
-	printf "If you don't have one, this will fail!\n"
-else
-	grub-mkimage -c ppc/early.cfg64 -v -p boot -o cdroot-ppc64/boot/grubcore.img -O powerpc-ieee1275 boot btrfs datetime disk ext2 gfxmenu help hfs hfsplus ieee1275_fb iso9660 jfs ls luks lvm macbless macho nilfs2 ofnet part_apple part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu
-fi
-
-cp AdelieTux.icns 'cdroot-ppc64/Icon
'
-cp ppc/grub.cfg64 cdroot-ppc64/boot/grub.cfg
-cp ppc/ofboot.b cdroot-ppc64/boot/ofboot.b
-cp cdroot-ppc64/boot/ofboot.b cdroot-ppc64/boot/bootinfo.txt
-
-# Fix petitboot
-mkdir cdroot-ppc64/boot/grub
-cp ppc/grub.cfg64 cdroot-ppc64/boot/grub/grub.cfg
-
-# Fix CHRP
-mkdir cdroot-ppc64/ppc
-cp cdroot-ppc64/boot/bootinfo.txt cdroot-ppc64/ppc/bootinfo.txt
diff --git a/post/arch/x86_64.sh b/post/arch/x86_64.sh
deleted file mode 100755
index 04d0f6d..0000000
--- a/post/arch/x86_64.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-mkdir -p cdroot-x86_64/boot
-
-if ! type grub-mkimage>/dev/null; then
-	printf "GRUB image cannot be created.  Using stale copy.\n"
-	printf "If you don't have one, this will fail!\n"
-else
-	printf '\033[01;32m * \033[37mInstalling GRUB...\033[00;39m\n'
-	grub-mkimage -c x86/early.cfg64 -v -p boot -o grubcore-stage1.img -O i386-pc biosdisk boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs linux ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs reboot gfxterm gfxterm_background gfxterm_menu all_video
-	cat /usr/lib/grub/i386-pc/cdboot.img grubcore-stage1.img > cdroot-x86_64/boot/grubcore.img
-
-	grub-mkimage -c x86/early.cfg64 -v -p boot -o x86/efi64.exe -O x86_64-efi boot btrfs datetime disk ext2 gfxmenu help iso9660 jfs ls luks lvm memdisk nilfs2 normal part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu all_video
-fi
-
-cp x86/grub.cfg64 cdroot-x86_64/boot/grub.cfg
-
-mkdir -p cdroot-x86_64/System/Library/CoreServices
-touch cdroot-x86_64/System/Library/CoreServices/mach_kernel
-cat >cdroot-x86_64/System/Library/CoreServices/SystemVersion.plist <<PLIST
-<plist version="1.0">
-<dict>
-	<key>ProductBuildVersion</key>
-	<string>1B4</string>
-	<key>ProductName</key>
-	<string>Adélie Linux</string>
-	<key>ProductVersion</key>
-	<string>1.0-BETA4</string>
-</dict>
-PLIST
-cp disk-label cdroot-x86_64/System/Library/CoreServices/.disk_label
-echo 'Adélie 1.0-BETA4' >cdroot-x86_64/System/Library/CoreServices/.disk_label.contentDetails
-cp x86/efi64.exe cdroot-x86_64/System/Library/CoreServices/boot.efi
-
-if ! type mkfs.fat>/dev/null; then
-	printf "EFI image cannot be created.\n"
-	printf "If one does not already exist, this CD will boot BIOS systems only.\n"
-else
-	mkdir -p x86/efitemp
-	dd if=/dev/zero of=x86/efi64.img bs=1024 count=1440
-	mkfs.fat x86/efi64.img
-	mount -t vfat -o loop,rw x86/efi64.img x86/efitemp
-	mkdir -p x86/efitemp/EFI/BOOT
-	mv x86/efi64.exe x86/efitemp/EFI/BOOT/bootx64.efi
-	umount x86/efitemp
-	rmdir x86/efitemp
-fi
-cp x86/efi64.img cdroot-x86_64/efi.img