From 013ea1d83c07b4c5281b20acc9e9adb0efd030ca Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 23 Sep 2012 22:33:46 -0300 Subject: [configs/releng] Add some disk/part/fs tools Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.x86_64 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configs/releng/packages.x86_64') diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index a5be3c4..01a52d2 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -12,6 +12,7 @@ dnsutils dosfstools efibootmgr elinks +fsarchiver gnu-netcat gptfdisk grml-zsh-config @@ -25,6 +26,7 @@ irssi lftp lilo linux-atm +mc mtools netcfg nfs-utils @@ -36,7 +38,9 @@ ntp openconnect openssh openvpn +partclone parted +partimage pptpclient refind-efi-x86_64 rp-pppoe @@ -45,6 +49,7 @@ smartmontools speedtouch sudo tcpdump +testdisk usb_modeswitch vpnc wget -- cgit v1.2.3-54-g00ecf From 7fa34a628c9625ed557a5d9e30a056785a38272e Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 26 Sep 2012 12:22:54 -0300 Subject: [configs/releng] refind-efi-x86_64 -> refind-efi Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.x86_64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/releng/packages.x86_64') diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 01a52d2..fa43983 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -42,7 +42,7 @@ partclone parted partimage pptpclient -refind-efi-x86_64 +refind-efi rp-pppoe rsync smartmontools -- cgit v1.2.3-54-g00ecf From d902b8f32c58823fa8fa9f769e3603cfad657329 Mon Sep 17 00:00:00 2001 From: Keshav P R Date: Wed, 26 Sep 2012 12:24:41 -0300 Subject: [configs/releng] Use gummiboot-efi instead of UEFI Shell for booting Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 55 +++++++++++++++------- .../efiboot/loader/entries/archiso-x86_64-cd.conf | 4 ++ .../efiboot/loader/entries/archiso-x86_64-usb.conf | 4 ++ .../loader/entries/uefi-shell-v1-x86_64.conf | 2 + .../loader/entries/uefi-shell-v2-x86_64.conf | 2 + configs/releng/efiboot/loader/loader.conf | 2 + configs/releng/packages.x86_64 | 1 + 7 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf create mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf create mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf create mode 100644 configs/releng/efiboot/loader/loader.conf (limited to 'configs/releng/packages.x86_64') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 63cbad0..0f2ebfb 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -69,6 +69,28 @@ make_boot() { make_boot_efi() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then if [[ ${arch} == "x86_64" ]]; then + ## Start - UEFI USB + + mkdir -p ${work_dir}/iso/EFI/boot + cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi + + mkdir -p ${work_dir}/iso/loader/entries + cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/loader.conf + cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/uefi-shell-v2-x86_64.conf + cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/uefi-shell-v1-x86_64.conf + + sed "s|%ARCHISO_LABEL%|${iso_label}|g; + s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf + + # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell ) + wget -O ${work_dir}/iso/EFI/shellx64_v2.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi + # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell ) + wget -O ${work_dir}/iso/EFI/shellx64_v1.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi + + ## End - UEFI USB + + ## Start - UEFI CD + mkdir -p ${work_dir}/iso/EFI/archiso dd of=${work_dir}/iso/EFI/archiso/efiboot.img bs=1 seek=20M count=0 mkfs.vfat ${work_dir}/iso/EFI/archiso/efiboot.img @@ -80,29 +102,28 @@ make_boot_efi() { cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/archiso/vmlinuz.efi cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img - # There are plans to support command line options via a config file (not yet in linux-3.3) - #cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/boot/bootx64.efi - #cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/boot/linux.img - #echo "archisolabel=${iso_label} initrd=\EFI\boot\linux.img" | iconv -f ascii -t ucs2 > ${work_dir}/iso/EFI/boot/linux.conf - - # For now, provide an EFI-shell until 'linux.conf' hits mainline. mkdir -p ${work_dir}/efiboot/EFI/boot - # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell ) - #wget -O ${work_dir}/efiboot/EFI/boot/bootx64.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi - # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell ) - wget -O ${work_dir}/efiboot/EFI/boot/bootx64.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi + cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi - # Add an EFI shell script for automatic boot if ESC-key is not pressed within 5 seconds timeout. - sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/EFI/boot/startup_iso.nsh > ${work_dir}/efiboot/EFI/boot/startup.nsh - - mkdir -p ${work_dir}/iso/EFI/boot - cp ${work_dir}/efiboot/EFI/boot/bootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi + mkdir -p ${work_dir}/efiboot/loader/entries + cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/loader.conf + cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf + cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/EFI/boot/startup_usb.nsh > ${work_dir}/iso/EFI/boot/startup.nsh + s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf + cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/shellx64_v2.efi + cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/shellx64_v1.efi + + # There are plans to support command line options via a config file (not yet in linux-3.3) + #cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/boot/bootx64.efi + #cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/boot/archiso.img + #echo "archisobasedir=${install_dir} archisolabel=${iso_label} initrd=\\EFI\\boot\\archiso.img" > ${work_dir}/efiboot/EFI/boot/linux.conf + umount ${work_dir}/efiboot + + ## End - UEFI CD fi : > ${work_dir}/build.${FUNCNAME} fi diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf new file mode 100644 index 0000000..9892c59 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -0,0 +1,4 @@ +title Arch Linux archiso x86_64 UEFI CD +linux /EFI/archiso/vmlinuz.efi +initrd /EFI/archiso/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf new file mode 100644 index 0000000..f61c532 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -0,0 +1,4 @@ +title Arch Linux archiso x86_64 UEFI USB +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz +initrd /%INSTALL_DIR%/boot/x86_64/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf new file mode 100644 index 0000000..9597ff2 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf @@ -0,0 +1,2 @@ +title UEFI Shell x86_64 v1 +efi /EFI/shellx64_v1.efi diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf new file mode 100644 index 0000000..0dde77a --- /dev/null +++ b/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf @@ -0,0 +1,2 @@ +title UEFI Shell x86_64 v2 +efi /EFI/shellx64_v2.efi diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf new file mode 100644 index 0000000..62c4a83 --- /dev/null +++ b/configs/releng/efiboot/loader/loader.conf @@ -0,0 +1,2 @@ +timeout 3 +default archiso-x86_64 diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index fa43983..35114ae 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -18,6 +18,7 @@ gptfdisk grml-zsh-config grub-bios grub-efi-x86_64 +gummiboot-efi haveged hdparm ipw2100-fw -- cgit v1.2.3-54-g00ecf From 72b34f572ec2f1c2e8f1af88e742853726200178 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 4 Oct 2012 19:21:08 -0300 Subject: [configs/releng] Add ethtool to live-enviroment FS#28773 - [ethtool] [net-tools] one of packages should belong to base group Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.i686 | 1 + configs/releng/packages.x86_64 | 1 + 2 files changed, 2 insertions(+) (limited to 'configs/releng/packages.x86_64') diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index 194774c..b300c60 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -12,6 +12,7 @@ dnsutils dosfstools efibootmgr elinks +ethtool fsarchiver gnu-netcat gptfdisk diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 35114ae..4d93c78 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -12,6 +12,7 @@ dnsutils dosfstools efibootmgr elinks +ethtool fsarchiver gnu-netcat gptfdisk -- cgit v1.2.3-54-g00ecf From 077e81e4585a2490f4fa9251a9f3602c9ed4ce02 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 5 Oct 2012 12:27:42 +0200 Subject: Add rfkill to the live system Some wireless devices need to be enabled before use which is easier using rfkill. Signed-off-by: Pierre Schmitz --- configs/releng/packages.i686 | 1 + configs/releng/packages.x86_64 | 1 + 2 files changed, 2 insertions(+) (limited to 'configs/releng/packages.x86_64') diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index b300c60..032b666 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -42,6 +42,7 @@ partclone parted partimage pptpclient +rfkill rp-pppoe rsync smartmontools diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 4d93c78..21ab1c8 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -45,6 +45,7 @@ parted partimage pptpclient refind-efi +rfkill rp-pppoe rsync smartmontools -- cgit v1.2.3-54-g00ecf From 76ef155a04effa6741f4db2384eba90671a2fdba Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Oct 2012 14:40:40 -0300 Subject: [configs/releng] make packages.both for common packages for each x86_64 Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 2 +- configs/releng/packages.both | 60 +++++++++++++++++++++++++++++++++++++++++ configs/releng/packages.i686 | 61 ------------------------------------------ configs/releng/packages.x86_64 | 61 ------------------------------------------ 4 files changed, 61 insertions(+), 123 deletions(-) create mode 100644 configs/releng/packages.both (limited to 'configs/releng/packages.x86_64') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 2699468..ab8097c 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -38,7 +38,7 @@ make_basefs() { # Additional packages (root-image) make_packages() { - mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" install + mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install } # Copy mkinitcpio archiso hooks (root-image) diff --git a/configs/releng/packages.both b/configs/releng/packages.both new file mode 100644 index 0000000..4bab7de --- /dev/null +++ b/configs/releng/packages.both @@ -0,0 +1,60 @@ +arch-install-scripts +b43-fwcutter +btrfs-progs +crda +darkhttpd +ddrescue +dhclient +dialog +dmraid +dnsmasq +dnsutils +dosfstools +elinks +ethtool +fsarchiver +gnu-netcat +gptfdisk +grml-zsh-config +grub-bios +haveged +hdparm +ipw2100-fw +ipw2200-fw +irssi +lftp +lilo +linux-atm +mc +mtools +netcfg +nfs-utils +nilfs-utils +nmap +ntfs-3g +ntfsprogs +ntp +openconnect +openssh +openvpn +partclone +parted +partimage +pptpclient +rfkill +rp-pppoe +rsync +smartmontools +speedtouch +sudo +tcpdump +testdisk +usb_modeswitch +vpnc +wget +wireless_tools +wpa_actiond +wvdial +xl2tpd +zd1211-firmware +zsh diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index 032b666..e69de29 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -1,61 +0,0 @@ -arch-install-scripts -b43-fwcutter -btrfs-progs -crda -darkhttpd -ddrescue -dhclient -dialog -dmraid -dnsmasq -dnsutils -dosfstools -efibootmgr -elinks -ethtool -fsarchiver -gnu-netcat -gptfdisk -grml-zsh-config -grub-bios -haveged -hdparm -ipw2100-fw -ipw2200-fw -irssi -lftp -lilo -linux-atm -mc -mtools -netcfg -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntfsprogs -ntp -openconnect -openssh -openvpn -partclone -parted -partimage -pptpclient -rfkill -rp-pppoe -rsync -smartmontools -speedtouch -sudo -tcpdump -testdisk -usb_modeswitch -vpnc -wget -wireless_tools -wpa_actiond -wvdial -xl2tpd -zd1211-firmware -zsh diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 21ab1c8..137c9d5 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,64 +1,3 @@ -arch-install-scripts -b43-fwcutter -btrfs-progs -crda -darkhttpd -ddrescue -dhclient -dialog -dmraid -dnsmasq -dnsutils -dosfstools -efibootmgr -elinks -ethtool -fsarchiver -gnu-netcat -gptfdisk -grml-zsh-config -grub-bios grub-efi-x86_64 gummiboot-efi -haveged -hdparm -ipw2100-fw -ipw2200-fw -irssi -lftp -lilo -linux-atm -mc -mtools -netcfg -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntfsprogs -ntp -openconnect -openssh -openvpn -partclone -parted -partimage -pptpclient refind-efi -rfkill -rp-pppoe -rsync -smartmontools -speedtouch -sudo -tcpdump -testdisk -usb_modeswitch -vpnc -wget -wireless_tools -wpa_actiond -wvdial -xl2tpd -zd1211-firmware -zsh -- cgit v1.2.3-54-g00ecf