From a49acab0ac399ee36e03327d9a248f02cf1468f8 Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 2 Aug 2020 20:01:25 -0400 Subject: [baseline] fix some wrong stuff Signed-off-by: David P --- configs/baseline/build.sh | 4 ++-- configs/baseline/packages.both | 2 +- 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 -- cgit v1.2.2