Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2020-08-12 18:24:30 +0300
committernl6720 <nl6720@gmail.com>2020-08-17 21:33:20 +0300
commite9f209efbf344213609d39b652e7bcbbfa14054d (patch)
treec02cd24ddb2bb48d7476b3c2de43cd1ae68690ce /archiso
parent31b1dfdbe40dc8c0dace436790708ced784fc402 (diff)
Deprecate build.sh scripts and old mkarchiso commands
Replace build.sh scripts with calls to mkarchiso -B "profiledir" build_profile. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/37 .
Diffstat (limited to 'archiso')
-rwxr-xr-xarchiso/mkarchiso23
1 files changed, 9 insertions, 14 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 482d934..7602e62 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -92,8 +92,8 @@ _usage () {
IFS='' read -r -d '' usagetext <<ENDUSAGETEXT || true
usage ${app_name} [options] command <command options>
general options:
+ -B <profile_dir> Directory of the archiso profile to build
-p PACKAGE(S) Package(s) to install, can be used multiple times
- -r <command> Run <command> inside airootfs
-C <file> Config file for pacman.
Default: '${pacman_conf}'
-L <label> Set a label for the disk
@@ -118,18 +118,8 @@ usage ${app_name} [options] command <command options>
-v Enable verbose output
-h This message
commands:
- init
- Make base layout and install base group
- install
- Install all specified packages (-p)
- run
- run command specified by -r
- prepare
- build all images
- pkglist
- make a pkglist.txt of packages installed on airootfs
- iso <image name>
- build an iso image from the working dir
+ build_profile
+ build an iso image from a profile
ENDUSAGETEXT
printf '%s\n' "${usagetext}"
exit "${1}"
@@ -703,7 +693,6 @@ command_run() {
}
command_build_profile() {
- _msg_warning "The ${FUNCNAME[0]#command_} command is not fully implemented yet :("
# Set up essential directory paths
airootfs_dir="${work_dir}/${arch}/airootfs"
isofs_dir="${work_dir}/iso"
@@ -772,21 +761,27 @@ isofs_dir="${work_dir}/iso"
case "${command_name}" in
init)
+ _msg_warning "The '${command_name}' command is deprecated!"
command_init
;;
install)
+ _msg_warning "The '${command_name}' command is deprecated!"
command_install
;;
run)
+ _msg_warning "The '${command_name}' command is deprecated!"
command_run
;;
prepare)
+ _msg_warning "The '${command_name}' command is deprecated!"
command_prepare
;;
pkglist)
+ _msg_warning "The '${command_name}' command is deprecated!"
command_pkglist
;;
iso)
+ _msg_warning "The '${command_name}' command is deprecated!"
if (( $# < 2 )); then
_msg_error "No image specified" 0
_usage 1