From 22b1fb4c6be298a2df707247d316b7b897010bc6 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 23 Jun 2018 22:22:28 -0300 Subject: [releng] bye zd1211-firmware --- configs/releng/packages.x86_64 | 1 - 1 file changed, 1 deletion(-) (limited to 'configs') diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 9417e57..bae8238 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -62,4 +62,3 @@ wireless_tools wpa_actiond wvdial xl2tpd -zd1211-firmware -- cgit v1.2.3-70-g09d2 From 7e6b7157e697f88b70f38889e2641f5c22cc980c Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 23 Jun 2018 22:24:11 -0300 Subject: [releng] bye pcmcia initcpio --- configs/releng/mkinitcpio.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index 7f39b2c..c04f1dc 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard) +HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) COMPRESSION="xz" -- cgit v1.2.3-70-g09d2 From 02164ac244edd5e73039a8b1700ad4339a0dd405 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 23 Jun 2018 22:38:34 -0300 Subject: [releng] support for -P iso_publisher and -A iso_application in build.sh Implement FS#54126 --- configs/releng/build.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 6f4825b..595bfa2 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -4,6 +4,8 @@ set -e -u iso_name=archlinux iso_label="ARCH_$(date +%Y%m)" +iso_publisher="Arch Linux " +iso_application="Arch Linux Live/Rescue CD" iso_version=$(date +%Y.%m.%d) install_dir=arch work_dir=work @@ -26,6 +28,10 @@ _usage () echo " Default: ${iso_version}" echo " -L Set an iso label (disk label)" echo " Default: ${iso_label}" + echo " -P Set a publisher for the disk" + echo " Default: '${iso_publisher}'" + echo " -A Set an application name for the disk" + echo " Default: '${iso_application}'" echo " -D Set an install_dir (directory inside iso)" echo " Default: ${install_dir}" echo " -w Set the working directory" @@ -209,7 +215,7 @@ make_prepare() { # Build ISO make_iso() { - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso" + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso" } if [[ ${EUID} -ne 0 ]]; then @@ -217,11 +223,13 @@ if [[ ${EUID} -ne 0 ]]; then _usage 1 fi -while getopts 'N:V:L:D:w:o:g:vh' arg; do +while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do case "${arg}" in N) iso_name="${OPTARG}" ;; V) iso_version="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; + P) iso_publisher="${OPTARG}" ;; + A) iso_application="${OPTARG}" ;; D) install_dir="${OPTARG}" ;; w) work_dir="${OPTARG}" ;; o) out_dir="${OPTARG}" ;; -- cgit v1.2.3-70-g09d2 From 8f0ed7a69c8640eb74cd4db923c306f252a12ffe Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 28 Jun 2018 00:03:18 -0300 Subject: [releng] upgrade custom pacman.conf --- configs/releng/pacman.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index 45fe03d..c678d01 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u @@ -84,9 +85,17 @@ Include = /etc/pacman.d/mirrorlist [community] Include = /etc/pacman.d/mirrorlist +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs - -- cgit v1.2.3-70-g09d2 From fd228a9a440eae5692a99fa289c654f68a056be0 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 28 Jun 2018 00:40:13 -0300 Subject: [releng] Copy custom pacman.conf to airootfs --- configs/releng/build.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configs') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 595bfa2..180fa94 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -97,6 +97,8 @@ make_setup_mkinitcpio() { make_customize_airootfs() { cp -af ${script_path}/airootfs ${work_dir}/x86_64 + cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc + curl -o ${work_dir}/x86_64/airootfs/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/x86_64/airootfs/root/install.txt -- cgit v1.2.3-70-g09d2