Skip to content

Commit 6c23322

Browse files
committed
[remove] : Removed old codes
1 parent 052b6d4 commit 6c23322

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

build.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,6 @@ make_packages_repo() {
583583
# Install packages on airootfs
584584
_pacstrap "${_pkglist[@]}"
585585

586-
# Upgrade cached package
587-
# _run_with_pacmanconf _chroot_run pacman -Syy --noconfirm --config "/etc/alteriso-pacman.conf"
588-
589586
return 0
590587
}
591588

@@ -609,18 +606,17 @@ make_packages_aur() {
609606
}
610607

611608
make_pkgbuild() {
612-
#-- PKGBUILDが入ってるディレクトリの一覧 --#
609+
# Get PKGBUILD List
613610
local _pkgbuild_dirs=("${channel_dir}/pkgbuild.any" "${channel_dir}/pkgbuild.${arch}")
614611
for_module '_pkgbuild_dirs+=("${module_dir}/{}/pkgbuild.any" "${module_dir}/{}/pkgbuild.${arch}")'
615612

616-
#-- PKGBUILDが入ったディレクトリを作業ディレクトリにコピー --#
613+
# Copy PKGBUILD to work
617614
mkdir -p "${airootfs_dir}/pkgbuilds/"
618615
for _dir in $(find "${_pkgbuild_dirs[@]}" -type f -name "PKGBUILD" -print0 2>/dev/null | xargs -0 -I{} realpath {} | xargs -I{} dirname {}); do
619616
msg_info "Find $(basename "${_dir}")"
620617
cp -r "${_dir}" "${airootfs_dir}/pkgbuilds/"
621618
done
622619

623-
#-- ビルドスクリプトの実行 --#
624620
# copy buold script
625621
cp -rf --preserve=mode "${script_path}/system/pkgbuild.sh" "${airootfs_dir}/root/pkgbuild.sh"
626622

@@ -861,7 +857,6 @@ make_efi() {
861857
install -d -m 0755 -- "${isofs_dir}/EFI/boot"
862858

863859
local _bootfile="$(basename "$(ls "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
864-
#cp "${airootfs_dir}/usr/lib/systemd/boot/efi/${_bootfile}" "${isofs_dir}/EFI/boot/${_bootfile#systemd-}"
865860
install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/${_bootfile}" "${isofs_dir}/EFI/boot/${_bootfile#systemd-}"
866861

867862
local _use_config_name="nosplash"

0 commit comments

Comments
 (0)