From 44905a2bdc4ce312c406f67428157ea43456db19 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 2 Feb 2020 14:27:01 -0600 Subject: Better organisation of package lists and post scripts --- adelie-build-cd | 28 ++++++++++++++------------ adelie-build-cd.8 | 10 +++++----- disk-label | Bin 2351 -> 2351 bytes packages | 54 --------------------------------------------------- packages-pmmx | 5 ----- packages-ppc | 2 -- packages-ppc64 | 4 ---- packages-x86_64 | 5 ----- packages/arch/pmmx | 5 +++++ packages/arch/ppc | 2 ++ packages/arch/ppc64 | 4 ++++ packages/arch/x86_64 | 5 +++++ packages/base | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ post-pmmx.sh | 48 --------------------------------------------- post-ppc.sh | 17 ---------------- post-ppc64.sh | 23 ---------------------- post-x86_64.sh | 46 ------------------------------------------- post/arch/pmmx.sh | 48 +++++++++++++++++++++++++++++++++++++++++++++ post/arch/ppc.sh | 17 ++++++++++++++++ post/arch/ppc64.sh | 23 ++++++++++++++++++++++ post/arch/x86_64.sh | 46 +++++++++++++++++++++++++++++++++++++++++++ 21 files changed, 225 insertions(+), 221 deletions(-) delete mode 100644 packages delete mode 100644 packages-pmmx delete mode 100644 packages-ppc delete mode 100644 packages-ppc64 delete mode 100644 packages-x86_64 create mode 100644 packages/arch/pmmx create mode 100644 packages/arch/ppc create mode 100644 packages/arch/ppc64 create mode 100644 packages/arch/x86_64 create mode 100644 packages/base delete mode 100755 post-pmmx.sh delete mode 100644 post-ppc.sh delete mode 100755 post-ppc64.sh delete mode 100755 post-x86_64.sh create mode 100755 post/arch/pmmx.sh create mode 100644 post/arch/ppc.sh create mode 100755 post/arch/ppc64.sh create mode 100755 post/arch/x86_64.sh diff --git a/adelie-build-cd b/adelie-build-cd index 465bd02..ee09405 100755 --- a/adelie-build-cd +++ b/adelie-build-cd @@ -1,7 +1,7 @@ #!/bin/sh -e def_arch=$(uname -m) -def_ver="1.0-beta4" +def_ver="1.0" declare -r PROGNAME=$(basename $0) @@ -143,9 +143,9 @@ clean_dirs() { install_pkgs() { header "Installing base system to squash root..." - declare -r PACKAGES=$(cat packages 2>/dev/null || fatal 'No core packages specified') - declare -r ARCH_PKGS=$(cat packages-$ARCH 2>/dev/null || echo '') - declare -r KIND_PKGS=$(cat packages-$KIND 2>/dev/null || echo '') + declare -r PACKAGES=$(cat packages/base 2>/dev/null || fatal 'No core packages specified') + declare -r ARCH_PKGS=$(cat packages/arch/$ARCH 2>/dev/null || echo '') + declare -r KIND_PKGS=$(cat packages/kind/$KIND 2>/dev/null || echo '') mkdir -p squashroot-$ARCH/etc/apk/keys cp 'packages@adelielinux.org.pub' squashroot-$ARCH/etc/apk/keys/ @@ -183,12 +183,11 @@ make_structure() { squashroot-$ARCH/etc/runlevels/boot/$bootservice done - if [ -f services-$KIND ]; then - for service in $(cat services-$KIND 2>/dev/null || echo ''); do - ln -s /etc/init.d/$service \ - sqaushroot-$ARCH/etc/runlevels/default/$service - done - fi + for service in $(cat services/base 2>/dev/null || echo '') + $(cat services/kind/$KIND 2>/dev/null || echo ''); do + ln -s /etc/init.d/$service \ + sqaushroot-$ARCH/etc/runlevels/default/$service + done cat >squashroot-$ARCH/etc/fstab <<- FSTAB # Welcome to Adélie Linux. @@ -308,9 +307,14 @@ make_initrd() { } prepare_cdroot() { - if test -f post-$ARCH.sh; then + if test -f post/arch/$ARCH.sh; then header 'Running architecture-specific scripts...' - sh post-$ARCH.sh + sh post/arch/$ARCH.sh + fi + + if test -f post/kind/$KIND.sh; then + header "Running $KIND script..." + sh post/kind/$KIND.sh fi header 'Adding kernel...' diff --git a/adelie-build-cd.8 b/adelie-build-cd.8 index 26489d2..885e29e 100644 --- a/adelie-build-cd.8 +++ b/adelie-build-cd.8 @@ -89,10 +89,10 @@ is not specified. Kinds are a specific set of packages and optional startup scripts that define a specific 'kind' of CD image. Official Kinds include Horizon, KDE Live, and MATE Live. You can specify your own by creating a -.Pa packages-$KIND +.Pa packages/kind/$KIND file containing the names of packages you wish (one per line). Additionally, you may optionally create a -.Pa services-$KIND +.Pa services/kind/$KIND file containing the names of services to start up in the default runlevel (one per line). .Sh ENVIRONMENT @@ -120,7 +120,7 @@ A list of additional parameters to provide to when generating the ISO image for the specified architecture. This is used to specify the correct layout for bootable discs on that architecture. .Pp -.It Pa packages-$ARCH +.It Pa packages/arch/$ARCH A list of architecture-specific packages to install on the created media, in addition to the default packages installed on every architecture. This is typically used for bootloaders and firmware manipulation packages. It can also @@ -130,7 +130,7 @@ or .Xr strace 1 and so on) on architectures that are still experimental. .Pp -.It Pa post-$ARCH.sh +.It Pa post/arch/$ARCH.sh If this file exists and is executable, it will be run just before .Xr mkisofs 8 to do any final preparation to the disc root before creating the image. @@ -140,7 +140,7 @@ adelie-build-cd -a x86_64 .Pp LDARCH=powerpc adelie-build-cd -a ppc .Pp -EXTRA_MIRROR=i525 LDARCH=i386 SIGNING_KEY=/etc/portage/adelie.key ./build-cd -a x86 +LDARCH=i386 SIGNING_KEY=/etc/portage/adelie.key ./adelie-build-cd -a pmmx .Sh SEE ALSO .Xr mksquashfs 1 , .Xr apk 8 , diff --git a/disk-label b/disk-label index 7c276d7..4085c2c 100644 Binary files a/disk-label and b/disk-label differ diff --git a/packages b/packages deleted file mode 100644 index 23418c8..0000000 --- a/packages +++ /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-pmmx b/packages-pmmx deleted file mode 100644 index 01b1b70..0000000 --- a/packages-pmmx +++ /dev/null @@ -1,5 +0,0 @@ -dmidecode -efibootmgr -grub-efi -mactel-boot -strace diff --git a/packages-ppc b/packages-ppc deleted file mode 100644 index 87a20f4..0000000 --- a/packages-ppc +++ /dev/null @@ -1,2 +0,0 @@ -grub-ieee1275 -mac-fdisk diff --git a/packages-ppc64 b/packages-ppc64 deleted file mode 100644 index c8d667f..0000000 --- a/packages-ppc64 +++ /dev/null @@ -1,4 +0,0 @@ -easy-kernel-power8 -easy-kernel-power8-modules -grub-ieee1275 -mac-fdisk diff --git a/packages-x86_64 b/packages-x86_64 deleted file mode 100644 index 01b1b70..0000000 --- a/packages-x86_64 +++ /dev/null @@ -1,5 +0,0 @@ -dmidecode -efibootmgr -grub-efi -mactel-boot -strace diff --git a/packages/arch/pmmx b/packages/arch/pmmx new file mode 100644 index 0000000..01b1b70 --- /dev/null +++ b/packages/arch/pmmx @@ -0,0 +1,5 @@ +dmidecode +efibootmgr +grub-efi +mactel-boot +strace diff --git a/packages/arch/ppc b/packages/arch/ppc new file mode 100644 index 0000000..87a20f4 --- /dev/null +++ b/packages/arch/ppc @@ -0,0 +1,2 @@ +grub-ieee1275 +mac-fdisk diff --git a/packages/arch/ppc64 b/packages/arch/ppc64 new file mode 100644 index 0000000..c8d667f --- /dev/null +++ b/packages/arch/ppc64 @@ -0,0 +1,4 @@ +easy-kernel-power8 +easy-kernel-power8-modules +grub-ieee1275 +mac-fdisk diff --git a/packages/arch/x86_64 b/packages/arch/x86_64 new file mode 100644 index 0000000..01b1b70 --- /dev/null +++ b/packages/arch/x86_64 @@ -0,0 +1,5 @@ +dmidecode +efibootmgr +grub-efi +mactel-boot +strace diff --git a/packages/base b/packages/base new file mode 100644 index 0000000..23418c8 --- /dev/null +++ b/packages/base @@ -0,0 +1,54 @@ +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/post-pmmx.sh b/post-pmmx.sh deleted file mode 100755 index e68e387..0000000 --- a/post-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 - cat /usr/lib/grub/i386-pc/cdboot.img grubcore-stage1.img > cdroot-pmmx/boot/grubcore.img - - grub-mkimage -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 -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 < - - ProductBuildVersion - 1B4 - ProductName - Adélie Linux - ProductVersion - 1.0-BETA4 - -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-ppc.sh b/post-ppc.sh deleted file mode 100644 index 2c4fe64..0000000 --- a/post-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-ppc64.sh b/post-ppc64.sh deleted file mode 100755 index dd4a5b9..0000000 --- a/post-ppc64.sh +++ /dev/null @@ -1,23 +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 - -mv squashroot-ppc64/boot/vmlinux-4.14.138-mc15-easy-power8 cdroot-ppc64/bzImage-p8 diff --git a/post-x86_64.sh b/post-x86_64.sh deleted file mode 100755 index 3117f86..0000000 --- a/post-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 - 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 -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 < - - ProductBuildVersion - 1B4 - ProductName - Adélie Linux - ProductVersion - 1.0-BETA4 - -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 diff --git a/post/arch/pmmx.sh b/post/arch/pmmx.sh new file mode 100755 index 0000000..e68e387 --- /dev/null +++ b/post/arch/pmmx.sh @@ -0,0 +1,48 @@ +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 + cat /usr/lib/grub/i386-pc/cdboot.img grubcore-stage1.img > cdroot-pmmx/boot/grubcore.img + + grub-mkimage -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 +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 < + + ProductBuildVersion + 1B4 + ProductName + Adélie Linux + ProductVersion + 1.0-BETA4 + +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 new file mode 100644 index 0000000..2c4fe64 --- /dev/null +++ b/post/arch/ppc.sh @@ -0,0 +1,17 @@ +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 new file mode 100755 index 0000000..dd4a5b9 --- /dev/null +++ b/post/arch/ppc64.sh @@ -0,0 +1,23 @@ +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 + +mv squashroot-ppc64/boot/vmlinux-4.14.138-mc15-easy-power8 cdroot-ppc64/bzImage-p8 diff --git a/post/arch/x86_64.sh b/post/arch/x86_64.sh new file mode 100755 index 0000000..3117f86 --- /dev/null +++ b/post/arch/x86_64.sh @@ -0,0 +1,46 @@ +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 + 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 +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 < + + ProductBuildVersion + 1B4 + ProductName + Adélie Linux + ProductVersion + 1.0-BETA4 + +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 -- cgit v1.2.3-70-g09d2