- Arch-releng - lists.archlinux.org

[arch-releng] pacman.conf.{i686,x86_64} ignored by archiso?
by Dieter Plaetinck 08 Apr '12

08 Apr '12

in the releng env (http://projects.archlinux.org/users/dieter/releng.git/tree/) it seems the pacman.conf.{i686,x86_64} files are now being ignored. (i enabled testing in there but it's not used) Frankly I don't even know/remember how this ever worked, I can't find a reference to these files anywhere. How does one control which pacman.conf archiso must use during building of the arch environment it puts on the isos? Dieter

3 6

[arch-releng] testbuilds are unbroken
by Dieter Plaetinck 06 Apr '12

06 Apr '12

fixed that issue with package signatures and some other AIF things.. tested archlinux-2012.04.05_04-00-01-core-x86_64.iso and does installs fine for me. note that i currently enabled testing repo so newer testbuilds will have testing enabled. (i need linux 3.3 for some EFI experiments)

2 3

[arch-releng] [RFC] [PATCH] [configs/releng] Add UEFI boot support via linux >= 3.3 EFI boot stub on x86_64
by Gerardo Exequiel Pozzi 05 Apr '12

05 Apr '12

This only works via EFI shell because we need to pass boot params to kernel. An aditional EFI shell is provided with an startup script for automatic booting. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- README | 3 +++ configs/releng/build.sh | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/README b/README index 57c87e3..711e51d 100644 --- a/README +++ b/README @@ -153,6 +153,9 @@ if nothing is specified on command line. + squashfs-tools for mksquashfs + libisoburn for xorriso +** For configs/releng build.sh needs theses packages (build host): + + dosfstools for mkfs.vfat + ** For these hooks needs these packages (on target root-image) * archiso + (none) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 2faf210..c041953 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -58,6 +58,29 @@ make_boot() { fi } +# Prepare EFI "El Torito" boot image (using Linux >= 3.3 EFI boot stub) +make_boot_efi() { + if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then + if [[ ${arch} == "x86_64" ]]; then + 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 + mkdir -p ${work_dir}/efiboot + mount ${work_dir}/iso/EFI/archiso/efiboot.img ${work_dir}/efiboot + mkdir -p ${work_dir}/efiboot/EFI/archiso + 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 + # Always provide an EFI shell for systems without it (most real hardware for home-end-users?). + mkdir -p ${work_dir}/efiboot/EFI/boot + wget -O ${work_dir}/efiboot/EFI/boot/bootx64.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiSh… + # Added an EFI shell script for automatic boot if ESC-key is not pressed. + echo "\EFI\archiso\vmlinuz.efi initrd=\EFI\archiso\archiso.img archisolabel=${iso_label}" > ${work_dir}/efiboot/EFI/boot/startup.nsh + umount ${work_dir}/efiboot + fi + : > ${work_dir}/build.${FUNCNAME} + fi +} + # Prepare /${install_dir}/boot/syslinux make_syslinux() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then @@ -259,6 +282,7 @@ make_common_single() { make_packages make_setup_mkinitcpio make_boot + make_boot_efi make_syslinux make_isolinux make_customize_root_image -- 1.7.9.5

2 6

[arch-releng] [DRAFT][RFC][PATCH][archiso] Add UEFI boot support via Linux >= 3.3 EFI boot stub.
by Gerardo Exequiel Pozzi 01 Apr '12

01 Apr '12

Support is only added to x86_64. This only works via (U)EFI shell. Boot with: fs0:\EFI\linux\vmlinuz.efi archisolabel=ARCH_201203 initrd=\EFI\linux\archiso.img There are plans to support command line options via a config file (not yet in linux-3.3), in such case vmlinuz.efi can be renamed to bootia64.efi and placed to \EFI\boot to automatic boot. --- archiso/mkarchiso | 11 ++++++++++- configs/releng/build.sh | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index ad88b0b..208f7b6 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -380,6 +380,8 @@ command_checksum () { # Create an ISO9660 filesystem from "iso" directory. command_iso () { + local _iso_efi_boot_args + if [[ ! -f "${work_dir}/iso/isolinux/isolinux.bin" ]]; then _msg_error "The file '${work_dir}/iso/isolinux/isolinux.bin' does not exist." 1 fi @@ -387,6 +389,12 @@ command_iso () { _msg_error "The file '${work_dir}/iso/isolinux/isohdpfx.bin' does not exist." 1 fi + if [[ -d "${work_dir}/iso/EFI" ]]; then + _iso_efi_boot_args="-eltorito-alt-boot --efi-boot EFI/archiso/archiso.fat -no-emul-boot" + else + _iso_efi_boot_args="" + fi + _show_config iso if _is_directory_changed "${work_dir}/iso" "${out_dir}/${img_name}"; then @@ -398,9 +406,10 @@ command_iso () { fi xorriso -as mkisofs ${_qflag} -r -l \ -b isolinux/isolinux.bin -c isolinux/boot.cat \ - -iso-level 3 \ -no-emul-boot -boot-load-size 4 -boot-info-table \ + ${_iso_efi_boot_args} \ -isohybrid-mbr ${work_dir}/iso/isolinux/isohdpfx.bin \ + -iso-level 3 \ -p "prepared by mkarchiso" \ -publisher "${iso_publisher}" \ -A "${iso_application}" \ diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 2faf210..f4ca11e 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -58,6 +58,29 @@ make_boot() { fi } +# Prepare /EFI (using linux EFI boot stub) +make_boot_efi() { + if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then + if [[ ${arch} == "x86_64" ]]; then + mkdir -p ${work_dir}/iso/EFI/linux + cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/iso/EFI/linux/vmlinuz.efi + cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/iso/EFI/linux/archiso.img + # There are plans to support command line options via a config file (not yet in linux-3.3) + # echo "archisolabel=${iso_label} initrd=\EFI\linux\archiso.img" | iconv -f ascii -t ucs2 > ${work_dir}/iso/EFI/linux/vmlinuz.conf + mkdir -p ${work_dir}/iso/EFI/archiso + mkdir -p ${work_dir}/fat + dd of=${work_dir}/iso/EFI/archiso/archiso.fat bs=1 seek=32M count=0 + mkfs.vfat ${work_dir}/iso/EFI/archiso/archiso.fat + mount ${work_dir}/iso/EFI/archiso/archiso.fat ${work_dir}/fat/ + mkdir -p ${work_dir}/fat/EFI/linux + cp ${work_dir}/iso/EFI/linux/vmlinuz.efi ${work_dir}/fat/EFI/linux + cp ${work_dir}/iso/EFI/linux/archiso.img ${work_dir}/fat/EFI/linux + # cp ${work_dir}/iso/EFI/linux/vmlinuz.conf ${work_dir}/fat/EFI/linux + umount ${work_dir}/fat/ + fi + fi +} + # Prepare /${install_dir}/boot/syslinux make_syslinux() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then @@ -155,6 +178,7 @@ make_core_repo() { fi } + # Process aitab # args: $1 (core | netinstall) make_aitab() { @@ -259,6 +283,7 @@ make_common_single() { make_packages make_setup_mkinitcpio make_boot + make_boot_efi make_syslinux make_isolinux make_customize_root_image -- 1.7.9.4

2 10

Re: [arch-releng] [DRAFT][RFC][PATCH][archiso] Add UEFI boot support via Linux >= 3.3 EFI boot stub.
by Keshav P R 30 Mar '12

30 Mar '12

---------- Forwarded message ---------- From: Rod Smith <rodsmith(a)rodsbooks.com> Date: Fri, Mar 30, 2012 at 04:21 Subject: Re: [arch-releng] [DRAFT][RFC][PATCH][archiso] Add UEFI boot support via Linux >= 3.3 EFI boot stub. To: Keshav P R <the.ridikulus.rat(a)gmail.com> On 03/29/2012 01:20 PM, Keshav P R wrote: See my comments below.... > On Tue, Mar 27, 2012 at 18:56, Gerardo Exequiel Pozzi > <vmlinuz386(a)yahoo.com.ar> wrote: >> >> On 03/27/2012 02:31 AM, Keshav P R wrote: >>> >>> >>> On Tue, Mar 27, 2012 at 07:04, Gerardo Exequiel Pozzi >>> <vmlinuz386(a)yahoo.com.ar> wrote: >>>> >>>> >>>> On 03/26/2012 11:16 AM, Keshav P R wrote: >>>>> >>>>> >>>>> On Tue, Mar 20, 2012 at 23:15, Gerardo Exequiel Pozzi >>>>> <vmlinuz386(a)yahoo.com.ar> wrote: >>>>>>> >>>>>>> >>>>>>> This is going to increase the iso size like hell. Having the kernel >>>>>>> and initrd files within a FAT image inside the iso is not a good idea. >>>>>>> A 32 MB fat image, come on. I know this is required for CD booting, >>>>>>> but this is not a good idea with efistub efilinux or elilo etc. For >>>>>>> USB booting you can just have the files in the iso itself, wherein the >>>>>>> user simply extract the iso in a FAT32 USB and boots from it. I say >>>>>>> drop support for iso booting via this fat fs image and support uefi >>>>>>> boot only in case of USBs. >>>>>>> >>>>>>> Regards. >>>>>>> >>>>>>> Keshav >>>>>>> >>>>>> OK, so just ignore this draft patch. UEFI boot support can be made >>>>>> manually by the user, just doing a copy of vmlinuz to the right place >>>>>> and >>>>>> optionally installing a boot manager. >>>>>> >>>>>> A documentation on the wiki is sufficient. >>>>> >>>>> >>>>> You might be interested in rEFInd-x86_64 >>>>> https://aur.archlinux.org/packages.php?ID=57632 which provides a nice >>>>> menu for EFISTUB kernels. >>>>> >>>>> Related info : >>>>> http://www.rodsbooks.com/refind/linux.html >>>>> http://www.rodsbooks.com/efi-bootloaders/efistub.html >>>>> >>>>> [QUOTE from http://www.rodsbooks.com/refind/linux.html] >>>>> rEFInd looks for a file called linux.conf in the same directory as the >>>>> kernel file. This file is a practical requirement for booting from an >>>>> auto-detected kernel. It consists of a series of lines, each of which >>>>> consists of a label followed by a series of kernel options. The first >>>>> line sets default options, and subsequent lines set options that are >>>>> accessible from the main menu tag's submenu screen. >>>>> >>>>> The intent of this system is that distribution maintainers can place >>>>> their kernels, initial RAM disks, and a linux.conf file in their own >>>>> subdirectory on the ESP. rEFInd will detect their kernels and create >>>>> one main menu entry for each kernel. Each entry will implement as many >>>>> options as there are lines in the linux.conf file. In this way, two or >>>>> more distributions can each maintain their boot loader entries, >>>>> without being too concerned for who maintains rEFInd as a whole. >>>>> [/QUOTE] >>>>> >>>>> The filename has been changed to refind_linux.conf in the upstream git >>>>> repo so that it does not conflict with the proposed efistub config >>>>> file by kernel devs >>>>> >>>>> >>>>> (http://sourceforge.net/p/refind/code/ci/c09200e2220b05bbade961bdc35f7da90d3…) >>>>> >>>>> This should be pretty straightforward to implement in Archiso. For >>>>> non-EFISTUB kernels like LTS ones, you can use efilinux-x86_64 >>>>> https://aur.archlinux.org/packages.php?ID=57972 (Usage instructions - >>>>> http://thread.gmane.org/gmane.linux.kernel/1172645 and >>>>> http://article.gmane.org/gmane.linux.kernel/1175060) This might be a >>>>> good alternative for grub2 uefi boot, although booting i686 kernels in >>>>> x86_64 UEFI will not be supported by EFISTUB (which can be done using >>>>> grub2). Support for mixed arch booting seems to have been merged for >>>>> 3.4-rc1 . >>>>> >>>>> Regards. >>>>> >>>>> Keshav >>>>> >>>> Thanks for the work. >>>> >>>> But this only added the advantage of passing command line options to the >>>> kernel. We still need a "FAT image" with bootx64.efi (rEFInd) + >>>> vmlinuz.efi >>>> + archiso.img (initramfs) + refind*.conf (for El Torito) that was the >>>> main >>>> dissapointed issue. Otherwise rEFInd can not find what file to load. >>>> >>> No. In this case just rEFInd (and the required icons - not all of >>> them) needs to be in the FAT image. The kernels and initramfs can be >>> in (ISO)/efi/(SUBDIR)/ along with (ISO)/efi/(SUBDIR)/refind_linux.conf >>> containing the kernel parameters. If the (SUBDIR) is "arch" , ie. >>> (ISO)/efi/arch/ , then refind will even display Archlinux icon making >>> it easy for the user to differentiate the iso kernels from other >>> kernels. >>> >>> All the answers are at http://www.rodsbooks.com/refind/ . >>> >>> Regards. >>> >>> Keshav >>> >> Are you sure? >> >> The only thing that can do rEFInd is launch EFI apps from drives listed by >> EFI firmware. A filesystem ISO9660 is not listed as a drive with filesystem >> by EFI, and rEFInd does not understand about ISO9660. >> >> Thanks. >> >> >> >> -- >> Gerardo Exequiel Pozzi >> \cos^2\alpha + \sin^2\alpha = 1 >> > > Rod? Some EFI implementations detect ISO-9660 filesystems and can read them, but I'm pretty sure that this is NOT true of all of them. VirtualBox's EFI can certainly do it. I've never gotten it to work on my laptop running UEFI DUET, but I think that's at least partly an issue with detecting disc changes on the laptop's optical drive. IIRC, at least one of my two UEFI PCs can read ISO-9660 *and* the contents of El Torito disk images, which can result in duplicated boot loader entries in some situations; but I think the other one can't read ISO-9660. On the flip side, I've heard that most Macs can't read the El Torito images, although they can read ISO-9660. (I haven't verified this, though.) I know that the Fedora/Red Hat people have been working on this. For instance, Matthew Garret has blogged about it publicly: http://mjg59.dreamwidth.org/4957.html At present, if you want an ISO-9660 image file to be bootable on EFI systems, your best bet is to put an EFI boot loader *BOTH* in the ISO-9660 filesystem *AND* in an El Torito image on the disc. If size is an issue, that means you'll probably need a boot loader that can read ISO-9660 so that it can read the kernel and initrd from outside the image file. AFAIK, that limits your choices to GRUB 2. In theory, another possibility would be to include a (presumably small) ISO-9660 driver for EFI in the El Torito image. That would broaden your choices of boot loaders considerably; however, if such a driver exists I don't know where it might be found. FWIW, in my tests, Ubuntu uses GRUB 2, Fedora uses GRUB Legacy, and OpenSUSE uses ELILO on their EFI-bootable optical disc images. If Fedora or OpenSUSE has found a way to "cheat," I don't know what they've done; but it looks like they've just swallowed the extra size requirements: - An Ubuntu 12.04 beta image has a file, boot/grub/efi.img, that holds a 512 KiB FAT filesystem with GRUB 2 (bootx64.efi). If they've got kernels buried in another image file, I've not found it. Since GRUB 2 has its own ISO-9660 driver, my guess is they use it to boot the kernel. - A Fedora 16 image has TWO image files, images/efiboot.img (916 KiB) and images/efidisk.img (135 MiB). The former holds GRUB Legacy, and the latter holds a GPT-partitioned whole-disk image with a boot loader, kernel, and initial RAM disk. I don't know why they've got two images. - An OpenSUSE 12.1 image has an image file, boot/x86_64/efi (44 MiB) that in turn holds ELILO, a kernel, and an initial RAM disk. It's conceivable that Fedora and/or OpenSUSE "cheat" by creating weird mapping in the filesystem so that the same sectors corresponding to the kernel can be accessed both directly as ISO-9660 files and inside FAT image files. If so, I don't know what software they might have done to do it. -- Rod Smith rodsmith(a)rodsbooks.com http://www.rodsbooks.com

2 3

[arch-releng] Errors with "AIF" in (daily) releng iso's ?
by Richard N 24 Mar '12

24 Mar '12

Hello all, I recently tried an "aif -p interactive" on some of the latest netinstall images from http://releng.archlinux.org/isos/, and I get an error: "ERROR: ask_checklist makes only sense if you specify at least 1 thing (tag,item and ON/OFF switch)" Also, if I try with the "aif -p automatic ...." it spews out the same errors along with "FATAL: Module aes-586 not found..." ? I also built a successful build of netinstall using the "archiso" build scripts, but with the same errors/results as above, when attemping to use "AIF" ? Are these errors due to some src's that aif needs on these newer kernels/images/builds/installs that may be out of date ? Thanks ahead. Rick.

2 5

[arch-releng] [RFC] [PATCH 1/3] [archiso] Implement own chroot functions in mkarchiso
by Gerardo Exequiel Pozzi 19 Mar '12

19 Mar '12

* Remove devtools dependency. * Better control over what files are touched inside chroot (root-image). Now: NONE :) * Two new commands: + init: To install {base} group and other needed packages (syslinux for now) + run: If we want to run some command inside chroot (mkinitcpio, locale-gen, useradd, etc etc...) * Renamed command: "created" to "install", says much better what does. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/mkarchiso | 103 +++++++++++++++++++++++++++++++++++++-------- configs/baseline/build.sh | 7 +-- configs/releng/build.sh | 19 ++++++--- 3 files changed, 102 insertions(+), 27 deletions(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index b3aa5cd..df3d354 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -5,6 +5,7 @@ set -e -u app_name=${0##*/} arch=$(uname -m) pkg_list="" +run_cmd="" quiet="y" pacman_conf="/etc/pacman.conf" export iso_label="ARCH_$(date +%Y%m)" @@ -44,6 +45,44 @@ _show_space_usage () { _msg_info "Total: ${_total} MiB (100%) | Used: ${_used} MiB (${_pct_u}) | Avail: ${_avail} MiB ($((100 - ${_pct_u%\%}))%)" } +_chroot_mount () { + mount -t devtmpfs dev "${work_dir}/root-image/dev" + mount -t devpts devpts "${work_dir}/root-image/dev/pts" + mount -t tmpfs devshm "${work_dir}/root-image/dev/shm" + mount -t proc proc "${work_dir}/root-image/proc" + mount -t tmpfs run "${work_dir}/root-image/run" + mount -t sysfs sys "${work_dir}/root-image/sys" + mount -t tmpfs tmp "${work_dir}/root-image/tmp" + + trap '_chroot_umount' EXIT HUP INT TERM +} + +_chroot_umount () { + umount "${work_dir}/root-image/tmp" + umount "${work_dir}/root-image/sys" + umount "${work_dir}/root-image/run" + umount "${work_dir}/root-image/proc" + umount "${work_dir}/root-image/dev/shm" + umount "${work_dir}/root-image/dev/pts" + umount "${work_dir}/root-image/dev" + + trap - EXIT HUP INT TERM +} + +_chroot_init() { + if [[ ! -d ${work_dir}/root-image/var/cache/pacman ]]; then + mkdir -p ${work_dir}/root-image/{dev,proc,run,sys,tmp,var/lib/pacman} + _pacman "base" + _pacman "syslinux" + fi +} + +_chroot_run() { + _chroot_mount + eval chroot ${work_dir}/root-image "${run_cmd}" + _chroot_umount +} + # Mount a filesystem (trap signals in case of error for unmounting it # $1: source image # $2: mount-point @@ -99,6 +138,7 @@ _usage () echo "usage ${app_name} [options] command <command options>" echo " general options:" echo " -p PACKAGE(S) Package(s) to install, can be used multiple times" + echo " -r <command> Run <command> inside root-image" echo " -C <file> Config file for pacman. Default ${pacman_conf}" echo " -L <label> Set a label for the disk" echo " -P <publisher> Set a publisher for the disk" @@ -113,9 +153,12 @@ _usage () echo " -v Enable verbose output" echo " -h This message" echo " commands:" - echo " create" - echo " create a base directory layout to work with" - echo " includes all specified packages" + echo " init" + echo " Make base layout and install base group" + echo " install" + echo " Install all specified packages (-p)" + echo " run" + echo " run command specified by -r" echo " prepare" echo " build all images" echo " checksum" @@ -126,7 +169,7 @@ _usage () } # Shows configuration according to command mode. -# $1: create | prepare | iso +# $1: init | install | run | prepare | checksum | iso _show_config () { local _mode="$1" echo @@ -136,10 +179,16 @@ _show_config () { _msg_info " Working directory: ${work_dir}" _msg_info " Installation directory: ${install_dir}" case "${_mode}" in - create) + init) + _msg_info " Pacman config file: ${pacman_conf}" + ;; + install) _msg_info " Pacman config file: ${pacman_conf}" _msg_info " Packages: ${pkg_list}" ;; + run) + _msg_info " Run command: ${run_cmd}" + ;; prepare) ;; checksum) @@ -159,20 +208,23 @@ _pacman () { _msg_info "Installing packages to '${work_dir}/root-image/'..." + _chroot_mount + if [[ "${quiet}" = "y" ]]; then - mkarchroot -n -C "${pacman_conf}" -f "${work_dir}/root-image" $* &> /dev/null + pacman -Sy -r "${work_dir}/root-image" --config "${pacman_conf}" --needed --noconfirm $* &> /dev/null else - mkarchroot -n -C "${pacman_conf}" -f "${work_dir}/root-image" $* + pacman -Sy -r "${work_dir}/root-image" --config "${pacman_conf}" --needed --noconfirm $* fi - # Cleanup - find "${work_dir}" -name "*.pacnew" -name "*.pacsave" -name "*.pacorig" -delete + _chroot_umount + _msg_info "Packages installed successfully!" } # Cleanup root-image _cleanup () { _msg_info "Cleaning up what we can on root-image" + # remove the initcpio images that were generated for the host system if [[ -d "${work_dir}/root-image/boot" ]]; then find "${work_dir}/root-image/boot" -name '*.img' -delete @@ -201,6 +253,8 @@ _cleanup () { if [[ -d "${work_dir}/root-image/tmp" ]]; then find "${work_dir}/root-image/tmp" -mindepth 1 -delete fi + # Delete package pacman related files. + find "${work_dir}" -name "*.pacnew" -name "*.pacsave" -name "*.pacorig" -delete # Create etc/mtab if not is a symlink. if [[ ! -L "${work_dir}/root-image/etc/mtab" ]]; then ln -sf "/proc/self/mounts" "${work_dir}/root-image/etc/mtab" @@ -384,7 +438,7 @@ command_prepare () { # Install packages on root-image. # A basic check to avoid double execution/reinstallation is done via hashing package names. -command_create () { +command_install () { if [[ ! -f "${pacman_conf}" ]]; then _msg_error "Pacman config file '${pacman_conf}' does not exist" 1 fi @@ -397,27 +451,36 @@ command_create () { _usage 1 fi - _show_config create + _show_config install local _pkg_list_hash _pkg_list_hash=$(echo ${pkg_list} | sort -u | md5sum | cut -c1-32) - if [[ -f "${work_dir}/create.${_pkg_list_hash}" ]]; then + if [[ -f "${work_dir}/install.${_pkg_list_hash}" ]]; then _msg_info "These packages are already installed, skipping." else - mkdir -p "${work_dir}/root-image/" _pacman "${pkg_list}" - : > "${work_dir}/create.${_pkg_list_hash}" + : > "${work_dir}/install.${_pkg_list_hash}" fi } +command_init() { + _show_config init + _chroot_init +} + +command_run() { + _show_config run + _chroot_run +} if [[ ${EUID} -ne 0 ]]; then _msg_error "This script must be run as root." 1 fi -while getopts 'p:C:L:P:A:D:w:o:vh' arg; do +while getopts 'p:r:C:L:P:A:D:w:o:vh' arg; do case "${arg}" in p) pkg_list="${pkg_list} ${OPTARG}" ;; + r) run_cmd="${OPTARG}" ;; C) pacman_conf="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; P) iso_publisher="${OPTARG}" ;; @@ -443,8 +506,14 @@ fi command_name="${1}" case "${command_name}" in - create) - command_create + init) + command_init + ;; + install) + command_install + ;; + run) + command_run ;; prepare) command_prepare diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 1f2251d..f7f7abf 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -15,8 +15,7 @@ script_path=$(readlink -f ${0%/*}) # Base installation (root-image) make_basefs() { - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "base" create - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "syslinux" create + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" init } # Copy mkinitcpio archiso hooks (root-image) @@ -33,7 +32,9 @@ make_setup_mkinitcpio() { make_boot() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} - mkarchroot -n -r "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img" ${work_dir}/root-image + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \ + -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' \ + run cp ${work_dir}/root-image/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img cp ${work_dir}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz : > ${work_dir}/build.${FUNCNAME} diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 42836a9..f206caf 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -15,13 +15,13 @@ script_path=$(readlink -f ${0%/*}) # Base installation (root-image) make_basefs() { - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "base" create - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "memtest86+ syslinux mkinitcpio-nfs-utils nbd curl" create + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" init + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd curl" install } # Additional packages (root-image) make_packages() { - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" create + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" install } # Copy mkinitcpio archiso hooks (root-image) @@ -46,7 +46,9 @@ make_boot() { local _src=${work_dir}/root-image local _dst_boot=${work_dir}/iso/${install_dir}/boot mkdir -p ${_dst_boot}/${arch} - mkarchroot -n -r "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img" ${_src} + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \ + -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' \ + run mv ${_src}/boot/archiso.img ${_dst_boot}/${arch}/archiso.img mv ${_src}/boot/vmlinuz-linux ${_dst_boot}/${arch}/vmlinuz cp ${_src}/boot/memtest86+/memtest.bin ${_dst_boot}/memtest @@ -90,7 +92,6 @@ make_isolinux() { } # Customize installation (root-image) -# NOTE: mkarchroot should not be executed after this function is executed, otherwise will overwrites some custom files. make_customize_root_image() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then cp -af ${script_path}/root-image ${work_dir} @@ -99,8 +100,12 @@ make_customize_root_image() { mkdir -p ${work_dir}/root-image/etc/pacman.d wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist http://www.archlinux.org/mirrorlist/all/ sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist - chroot ${work_dir}/root-image /usr/sbin/locale-gen - chroot ${work_dir}/root-image /usr/sbin/useradd -m -p "" -g users -G "audio,disk,optical,wheel" arch + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \ + -r 'locale-gen' \ + run + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \ + -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" arch' \ + run : > ${work_dir}/build.${FUNCNAME} fi } -- 1.7.9.4

2 6

[arch-releng] [RFC] [PATCH] [configs/releng] Add new build mode: all
by Gerardo Exequiel Pozzi 16 Mar '12

16 Mar '12

Warning: this is just a DRAFT and is untested. This mode allow to build all 6 ISOs in just one step if build type is <all>. So "build.sh build all all" -> (single-i686, single-x86_64, dual) X (netinstall, core). Note that the <purge> command is executed between each build step to save space, so do not use this mode if you want to keep all temporal files in work_dir. --- README | 19 ++----------- configs/releng/build.sh | 69 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 63 insertions(+), 25 deletions(-) diff --git a/README b/README index 9ee367e..0e7b2b4 100644 --- a/README +++ b/README @@ -249,20 +249,5 @@ on the same build directory or use -w <work_dir> option. # git clone git://projects.archlinux.org/archiso.git # make -C archiso/archiso install -* Build netinstall and core images (32-bit) - # linux32 /usr/share/archiso/configs/releng/build.sh build single all - -* Delete uneeded files (32-bit) - # linux32 /usr/share/archiso/configs/releng/build.sh purge single - -* Build netinstall and core images (64-bit) - # /usr/share/archiso/configs/releng/build.sh build single all - -* Delete uneeded files (64-bit) - # /usr/share/archiso/configs/releng/build.sh purge single - -* Build netinstall and core images (dual 32/64 bit) - # /usr/share/archiso/configs/releng/build.sh build dual all - -* Delete uneeded files (dual 32/64 bit) - # /usr/share/archiso/configs/releng/build.sh purge dual +* Build them! + # /usr/share/archiso/configs/releng/build.sh build all all diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 5c010ef..5f60cc8 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -10,6 +10,7 @@ arch=$(uname -m) work_dir=work out_dir=out verbose="" +cmd_args="" script_path=$(readlink -f ${0%/*}) @@ -296,7 +297,7 @@ _usage () echo " Clean working directory and .iso file in output directory of build <mode>" echo echo " Command options:" - echo " <mode> Valid values 'single' or 'dual'" + echo " <mode> Valid values 'single', 'dual' or 'all'" echo " <type> Valid values 'netinstall', 'core' or 'all'" exit ${1} } @@ -308,13 +309,34 @@ fi while getopts 'N:V:L:D:w:o:vh' arg; do case "${arg}" in - N) iso_name="${OPTARG}" ;; - V) iso_version="${OPTARG}" ;; - L) iso_label="${OPTARG}" ;; - D) install_dir="${OPTARG}" ;; - w) work_dir="${OPTARG}" ;; - o) out_dir="${OPTARG}" ;; - v) verbose="-v" ;; + N) + iso_name="${OPTARG}" + cmd_args+=" -N ${iso_name}" + ;; + V) + iso_version="${OPTARG}" + cmd_args+=" -V ${iso_version}" + ;; + L) + iso_label="${OPTARG}" + cmd_args+=" -L ${iso_label}" + ;; + D) + install_dir="${OPTARG}" + cmd_args+=" -D ${install_dir}" + ;; + w) + work_dir="${OPTARG}" + cmd_args+=" -w ${work_dir}" + ;; + o) + out_dir="${OPTARG}" + cmd_args+=" -o ${out_dir}" + ;; + v) + verbose="-v" + cmd_args+=" -v" + ;; h|?) _usage 0 ;; *) _msg_error "Invalid argument '${arg}'" 0 @@ -345,6 +367,11 @@ if [[ ${command_name} == "build" ]]; then command_type="${3}" fi +if [[ ${command_mode} == "all" && ${arch} != "x86_64" ]]; then + echo "This mode <all> needs to be run on x86_64" + _usage 1 +fi + if [[ ${command_mode} == "single" ]]; then work_dir=${work_dir}/${arch} fi @@ -390,6 +417,22 @@ case "${command_name}" in ;; esac ;; + all) + case "${command_type}" in + netinstall|core|all) + $0 ${cmd_args} build single ${command_type} + $0 ${cmd_args} purge single + linux32 $0 ${cmd_args} build single ${command_type} + linux32 $0 ${cmd_args} purge single + $0 ${cmd_args} build dual ${command_type} + $0 ${cmd_args} purge dual + ;; + *) + echo "Invalid build type '${command_type}'" + _usage 1 + ;; + esac + ;; *) echo "Invalid build mode '${command_mode}'" _usage 1 @@ -404,6 +447,11 @@ case "${command_name}" in dual) purge_dual ;; + all) + $0 ${cmd_args} purge single + linux32 $0 ${cmd_args} purge single + $0 ${cmd_args} purge dual + ;; *) echo "Invalid purge mode '${command_mode}'" _usage 1 @@ -418,6 +466,11 @@ case "${command_name}" in dual) clean_dual ;; + all) + $0 ${cmd_args} clean single + linux32 $0 ${cmd_args} clean single + $0 ${cmd_args} clean dual + ;; *) echo "Invalid clean mode '${command_mode}'" _usage 1 -- 1.7.9.4

1 1

[arch-releng] [RFC] [archiso] Populate /run/aif/AIF_IGNORE_DEVS with archiso virtual devices
by Thomas Bächler 14 Mar '12

14 Mar '12

The file /run/aif/AIF_IGNORE_DEVS can be used by AIF to filter the device list in the "Prepare Hard Drives" step. --- archiso/hooks/archiso | 4 ++++ archiso/hooks/archiso_loop_mnt | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 2635a4c..6d2eb07 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -19,6 +19,8 @@ _make_loop_dev() { local img="${1}" mknod /dev/loop${loop_dev_count} b 7 ${loop_dev_minor} &> /dev/null losetup /dev/loop${loop_dev_count} "${img}" &> /dev/null + mkdir -p /run/aif/ + echo /dev/loop${loop_dev_count} >> /run/aif/AIF_IGNORE_DEVS echo /dev/loop${loop_dev_count} } @@ -58,6 +60,8 @@ _mnt_fs() { rw_dev=$(_make_loop_dev "/run/archiso/cowspace/${cow_directory}/${img_name}.cow") echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8" | dmsetup create ${dm_snap_name} + mkdir -p /run/aif/ + echo /dev/mapper/${dm_snap_name} >> /run/aif/AIF_IGNORE_DEVS msg ":: Mounting '/dev/mapper/${dm_snap_name}' to '${newroot}${mnt}'" if ! mount "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" ; then diff --git a/archiso/hooks/archiso_loop_mnt b/archiso/hooks/archiso_loop_mnt index e52dc69..b326092 100644 --- a/archiso/hooks/archiso_loop_mnt +++ b/archiso/hooks/archiso_loop_mnt @@ -28,6 +28,8 @@ archiso_loop_mount_handler () { losetup -d ${_dev_loop} umount /run/archiso/img_dev else + mkdir -p /run/aif/ + echo ${_dev_loop} >> /run/aif/AIF_IGNORE_DEVS echo ${_dev_loop} > /run/archiso/img_dev_loop fi } -- 1.7.9

3 18

[arch-releng] GRUB2 in AIF
by Arokux B. 05 Mar '12

05 Mar '12

Hi, The Google Summer of Code Page [1] lists GRUB2 as a possible feature for AIF. I wonder if this is a random idea or is it rather backed by majority of devs. Thanks Arokux [1] https://wiki.archlinux.org/index.php?title=Google_Summer_of_Code

4 7