summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2018-09-11 13:47:03 -0300
committerDavid P <megver83@parabola.nu>2018-09-11 13:47:37 -0300
commitafcdbdeae93dc5f423bc1bd14cbb71d58147d81c (patch)
tree1fef8b3f6b65d2d6d86e758ac077eb30a9c06edf /configs
parent1cdf9a108b2fba6995c1ac429992e9c61c0e01ee (diff)
Release parabolaiso-v39v39
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/lxde-openrc/build.sh8
-rwxr-xr-xconfigs/profile-openrc/build.sh8
-rwxr-xr-xconfigs/profile/build.sh8
-rwxr-xr-xconfigs/talkingparabola/build.sh8
4 files changed, 16 insertions, 16 deletions
diff --git a/configs/lxde-openrc/build.sh b/configs/lxde-openrc/build.sh
index 02f16cd..d7aefa5 100755
--- a/configs/lxde-openrc/build.sh
+++ b/configs/lxde-openrc/build.sh
@@ -71,7 +71,7 @@ make_pacman_conf() {
# Base installation, plus needed packages (airootfs)
make_basefs() {
setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh" install
+ setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
}
# Additional packages (airootfs)
@@ -112,7 +112,7 @@ make_setup_mkinitcpio() {
make_customize_airootfs() {
cp -af ${script_path}/airootfs ${work_dir}/${arch}
- cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc
+ cp ${script_path}/pacman.conf ${work_dir}/${arch}/airootfs/etc
curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
@@ -137,6 +137,7 @@ make_boot_extra() {
# Prepare /${install_dir}/boot/syslinux
make_syslinux() {
+ _uname_r=$(file -b ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre| awk 'f{print;f=0} /version/{f=1}' RS=' ')
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
for _cfg in ${script_path}/syslinux/*.cfg; do
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
@@ -147,8 +148,7 @@ make_syslinux() {
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt
- gzip -c -9 ${work_dir}/${arch}/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz
- gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/*-gnu-*/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
+ gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
# inject edition title
sed -i "s|_EDITION_TITLE_|${iso_title}|" ${work_dir}/iso/${install_dir}/boot/syslinux/parabolaiso_head.cfg
diff --git a/configs/profile-openrc/build.sh b/configs/profile-openrc/build.sh
index a86a9cc..5d0e424 100755
--- a/configs/profile-openrc/build.sh
+++ b/configs/profile-openrc/build.sh
@@ -70,7 +70,7 @@ make_pacman_conf() {
# Base installation, plus needed packages (airootfs)
make_basefs() {
setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh" install
+ setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
}
# Additional packages (airootfs)
@@ -111,7 +111,7 @@ make_setup_mkinitcpio() {
make_customize_airootfs() {
cp -af ${script_path}/airootfs ${work_dir}/${arch}
- cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc
+ cp ${script_path}/pacman.conf ${work_dir}/${arch}/airootfs/etc
curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
@@ -136,6 +136,7 @@ make_boot_extra() {
# Prepare /${install_dir}/boot/syslinux
make_syslinux() {
+ _uname_r=$(file -b ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre| awk 'f{print;f=0} /version/{f=1}' RS=' ')
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
for _cfg in ${script_path}/syslinux/*.cfg; do
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
@@ -146,8 +147,7 @@ make_syslinux() {
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt
- gzip -c -9 ${work_dir}/${arch}/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz
- gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/*-gnu-*/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
+ gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
}
# Prepare /isolinux
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index eb1d134..bba82ce 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -70,7 +70,7 @@ make_pacman_conf() {
# Base installation, plus needed packages (airootfs)
make_basefs() {
setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh" install
+ setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
}
# Additional packages (airootfs)
@@ -111,7 +111,7 @@ make_setup_mkinitcpio() {
make_customize_airootfs() {
cp -af ${script_path}/airootfs ${work_dir}/${arch}
- cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc
+ cp ${script_path}/pacman.conf ${work_dir}/${arch}/airootfs/etc
curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
@@ -136,6 +136,7 @@ make_boot_extra() {
# Prepare /${install_dir}/boot/syslinux
make_syslinux() {
+ _uname_r=$(file -b ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre| awk 'f{print;f=0} /version/{f=1}' RS=' ')
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
for _cfg in ${script_path}/syslinux/*.cfg; do
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
@@ -146,8 +147,7 @@ make_syslinux() {
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt
- gzip -c -9 ${work_dir}/${arch}/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz
- gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/*-gnu-*/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
+ gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
}
# Prepare /isolinux
diff --git a/configs/talkingparabola/build.sh b/configs/talkingparabola/build.sh
index a5d354e..d1750b6 100755
--- a/configs/talkingparabola/build.sh
+++ b/configs/talkingparabola/build.sh
@@ -70,7 +70,7 @@ make_pacman_conf() {
# Base installation, plus needed packages (airootfs)
make_basefs() {
setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh" install
+ setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
}
# Additional packages (airootfs)
@@ -111,7 +111,7 @@ make_setup_mkinitcpio() {
make_customize_airootfs() {
cp -af ${script_path}/airootfs ${work_dir}/${arch}
- cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc
+ cp ${script_path}/pacman.conf ${work_dir}/${arch}/airootfs/etc
curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
@@ -136,6 +136,7 @@ make_boot_extra() {
# Prepare /${install_dir}/boot/syslinux
make_syslinux() {
+ _uname_r=$(file -b ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre| awk 'f{print;f=0} /version/{f=1}' RS=' ')
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
for _cfg in ${script_path}/syslinux/*.cfg; do
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
@@ -146,8 +147,7 @@ make_syslinux() {
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt
- gzip -c -9 ${work_dir}/${arch}/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz
- gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/*-gnu-*/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
+ gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
}
# Prepare /isolinux