summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2021-11-11 14:47:26 -0300
committerDavid P <megver83@parabola.nu>2021-11-11 14:48:22 -0300
commit6d86add71432f5ecbdb65e13b652417cef752447 (patch)
tree347049d53e9d666ea63f5f6d793b02cfaa0ddb84
parent8f2aee0a12287966842df28dcca183944d528f9b (diff)
sync with archiso
archiso: 1c42553 (HEAD -> master, origin/master, origin/HEAD) Merge remote-tracking branch 'nl6720/netboot-no-bootmodes' 662027e mkarchiso: do not require setting boot modes when building only netboot artifacts 2f207fd Merge remote-tracking branch 'nl6720/date' f8862c2 mkarchiso: replace external date command with printf a37c320 Merge remote-tracking branch 'nl6720/mailmap' caf64e0 Add .mailmap file Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r--.mailmap16
-rwxr-xr-xparabolaiso/mkparabolaiso45
2 files changed, 41 insertions, 20 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..d0456ac
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+Aaron Griffin <aaron@archlinux.org> <aaronmgriffin@gmail.com>
+Chandan Singh <cks071g2@gmail.com> chandan <cks071g2@gmail.com>
+Charles Vejnar <ce@vejnar.org> Charles <ce@vejnar.org>
+Christopher Brannon <cmbrannon79@gmail.com> <cmbrannon@cox.net>
+David Runge <dvzrv@archlinux.org> <dave@sleepmap.de>
+Eli Schwartz <eschwartz@archlinux.org> Eli Schwartz via arch-releng <arch-releng@archlinux.org>
+Francois Dupoux <fdupoux@users.sourceforge.net> fdupoux <fdupoux@users.sourceforge.net>
+Gerardo Exequiel Pozzi <vmlinuz386@gmail.com> <vmlinuz386@yahoo.com.ar>
+James Sitegen <jamesm.sitegen@gmail.com> jamesm-sitegen <jamesm.sitegen@gmail.com>
+Keshav Amburay <the.ridikulus.rat@gmail.com> Keshav P R <the.ridikulus.rat@gmail.com>
+Martin Damian Fernandez <martin.damian.fernandez@gmail.com> martindamianfernandez <martin.damian.fernandez@gmail.com>
+Michael Vorburger <mike@vorburger.ch> Michael Vorburger.ch <mike@vorburger.ch>
+Sean Enck <enckse@voidedtech.com> Sean Enck via arch-releng <arch-releng@archlinux.org>
+Simo Leone <simo@archlinux.org> <leone.simo@gmail.com>
+Sven-Hendrik Haase <svenstaro@gmail.com> <sh@lutzhaase.com>
+Yu Li-Yu <afg984@gmail.com> Li-Yu Yu via arch-releng <arch-releng@archlinux.org>
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index 73c215e..38a5c6f 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -7,7 +7,8 @@ set -e -u
# Control the environment
umask 0022
export LC_ALL="C"
-export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}"
+[[ -v SOURCE_DATE_EPOCH ]] || printf -v SOURCE_DATE_EPOCH '%(%s)T' -1
+export SOURCE_DATE_EPOCH
# Set application name from the script's file name
app_name="${0##*/}"
@@ -113,7 +114,7 @@ ENDUSAGETEXT
# Shows configuration options.
_show_config() {
local build_date
- build_date="$(date --utc --iso-8601=seconds -d "@${SOURCE_DATE_EPOCH}")"
+ printf -v build_date '%(%FT%R%z)T' "${SOURCE_DATE_EPOCH}"
_msg_info "${app_name} configuration settings"
_msg_info " Architecture: ${arch}"
_msg_info " Working directory: ${work_dir}"
@@ -131,7 +132,7 @@ _show_config() {
_msg_info " ISO volume label: ${iso_label}"
_msg_info " ISO publisher: ${iso_publisher}"
_msg_info " ISO application: ${iso_application}"
- _msg_info " Boot modes: ${bootmodes[*]}"
+ _msg_info " Boot modes: ${bootmodes[*]:-None}"
_msg_info " Packages File: ${buildmode_packages}"
_msg_info " Packages: ${buildmode_pkg_list[*]}"
if [[ "${arch}" == "dual" ]]; then
@@ -1005,6 +1006,22 @@ _validate_common_requirements_buildmode_iso_netboot() {
fi
fi
+ # Check if the specified airootfs_image_type is supported
+ if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
+ if typeset -f "_validate_requirements_airootfs_image_type_${airootfs_image_type}" &> /dev/null; then
+ "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
+ else
+ _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
+ fi
+ else
+ (( validation_error=validation_error+1 ))
+ _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
+ fi
+}
+
+_validate_requirements_buildmode_iso() {
+ _validate_common_requirements_buildmode_iso_netboot
+ _validate_common_requirements_buildmode_all
# Check if the specified bootmodes are supported
if (( ${#bootmodes[@]} < 1 )); then
(( validation_error=validation_error+1 ))
@@ -1023,22 +1040,6 @@ _validate_common_requirements_buildmode_iso_netboot() {
fi
done
- # Check if the specified airootfs_image_type is supported
- if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
- if typeset -f "_validate_requirements_airootfs_image_type_${airootfs_image_type}" &> /dev/null; then
- "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
- else
- _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
- fi
- else
- (( validation_error=validation_error+1 ))
- _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
- fi
-}
-
-_validate_requirements_buildmode_iso() {
- _validate_common_requirements_buildmode_iso_netboot
- _validate_common_requirements_buildmode_all
if ! command -v awk &> /dev/null; then
(( validation_error=validation_error+1 ))
_msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0
@@ -1499,7 +1500,11 @@ _build_iso_base() {
_run_dual '_run_once _make_version'
_run_dual '_run_once _make_customize_airootfs'
_run_dual '_run_once _make_pkglist'
- _make_bootmodes
+ if [[ "${buildmode}" == 'netboot' ]]; then
+ _run_dual '_run_once _make_boot_on_iso9660'
+ else
+ _make_bootmodes
+ fi
_run_dual '_run_once _cleanup_pacstrap_dir' \
'_run_once _prepare_airootfs_image'
}