summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-08-02 20:01:25 -0400
committerDavid P <megver83@parabola.nu>2020-08-02 20:10:27 -0400
commita49acab0ac399ee36e03327d9a248f02cf1468f8 (patch)
treef19f3b2c60877d03cd22d7dc499c97088bc31268
parentf40d33b9efe1628350b67ca3061bbb2168952173 (diff)
[baseline] fix some wrong stuff
Signed-off-by: David P <megver83@parabola.nu>
-rwxr-xr-xconfigs/baseline/build.sh4
-rw-r--r--configs/baseline/packages.both2
2 files changed, 3 insertions, 3 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 7c117cb..fce82fb 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -7,7 +7,7 @@ set -e -u
iso_name=parabola
iso_label="PARA_$(date +%Y%m)"
iso_version=$(date +%Y.%m.%d)
-install_dir=para
+install_dir=parabola
arch=$(uname -m)
work_dir=work
out_dir=out
@@ -74,7 +74,7 @@ make_boot() {
# Prepare /${install_dir}/boot/syslinux
make_syslinux() {
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
- sed "s|%parabolaiso_LABEL%|${iso_label}|g;
+ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g;
s|%ARCH%|${arch}|g" "${script_path}/syslinux/syslinux.cfg" > \
"${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg"
diff --git a/configs/baseline/packages.both b/configs/baseline/packages.both
index 495a6cb..62a9103 100644
--- a/configs/baseline/packages.both
+++ b/configs/baseline/packages.both
@@ -1,7 +1,7 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
base
-linux
+linux-libre
mkinitcpio
mkinitcpio-parabolaiso
syslinux