Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar --- 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

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