forked from mirrored-repos/manjaro-tools
rm openrc support
This commit is contained in:
parent
b6023bf92f
commit
9aefc30a38
17 changed files with 102 additions and 294 deletions
3
Makefile
3
Makefile
|
@ -45,8 +45,7 @@ LIBS_PKG = \
|
||||||
$(wildcard lib/util-pkg*.sh)
|
$(wildcard lib/util-pkg*.sh)
|
||||||
|
|
||||||
SHARED_PKG = \
|
SHARED_PKG = \
|
||||||
data/makepkg.conf \
|
data/makepkg.conf
|
||||||
data/base-devel-udev
|
|
||||||
|
|
||||||
LIST_ISO = \
|
LIST_ISO = \
|
||||||
$(wildcard data/iso.list.d/*.list)
|
$(wildcard data/iso.list.d/*.list)
|
||||||
|
|
82
README.md
82
README.md
|
@ -74,7 +74,7 @@ overriding
|
||||||
################ buildtree ###############
|
################ buildtree ###############
|
||||||
|
|
||||||
# manjaro package tree
|
# manjaro package tree
|
||||||
# repo_tree=('core' 'extra' 'community' 'multilib' 'openrc')
|
# repo_tree=('core' 'extra' 'community' 'multilib')
|
||||||
|
|
||||||
# host_tree=https://github.com/manjaro
|
# host_tree=https://github.com/manjaro
|
||||||
|
|
||||||
|
@ -92,16 +92,13 @@ overriding
|
||||||
# build_list_iso=default
|
# build_list_iso=default
|
||||||
|
|
||||||
# the dist release; default: auto
|
# the dist release; default: auto
|
||||||
# dist_release=17.0
|
# dist_release=17.1
|
||||||
|
|
||||||
# the branding; default: auto
|
# the branding; default: auto
|
||||||
# dist_branding="MJRO"
|
# dist_branding="MJRO"
|
||||||
|
|
||||||
# possible values: openrc,systemd
|
|
||||||
# initsys="systemd"
|
|
||||||
|
|
||||||
# unset defaults to given value
|
# unset defaults to given value
|
||||||
# kernel="linux49"
|
# kernel="linux414"
|
||||||
|
|
||||||
# gpg key; leave empty or commented to skip sfs signing
|
# gpg key; leave empty or commented to skip sfs signing
|
||||||
# gpgkey=""
|
# gpgkey=""
|
||||||
|
@ -111,6 +108,9 @@ overriding
|
||||||
# the server user
|
# the server user
|
||||||
# account=[SetUser]
|
# account=[SetUser]
|
||||||
|
|
||||||
|
# the server project: manjaro|manjaro-community
|
||||||
|
# project="[SetProject]"
|
||||||
|
|
||||||
# set upload bandwidth limit in kB/s
|
# set upload bandwidth limit in kB/s
|
||||||
# limit=100
|
# limit=100
|
||||||
|
|
||||||
|
@ -136,19 +136,18 @@ It it run in a abs/pkgbuilds directory which contains directories with PKGBUILD.
|
||||||
~~~
|
~~~
|
||||||
$ buildpkg -h
|
$ buildpkg -h
|
||||||
Usage: buildpkg [options]
|
Usage: buildpkg [options]
|
||||||
-p <pkg> Buildset or pkg [default: default]
|
|
||||||
-a <arch> Arch [default: auto]
|
-a <arch> Arch [default: auto]
|
||||||
-b <branch> Branch [default: stable]
|
-b <branch> Branch [default: stable]
|
||||||
|
-c Recreate chroot
|
||||||
|
-h This help
|
||||||
|
-i <pkg> Install a package into the working copy of the chroot
|
||||||
|
-n Install and run namcap check
|
||||||
|
-p <pkg> Buildset or pkg [default: default]
|
||||||
|
-q Query settings and pretend build
|
||||||
-r <dir> Chroots directory
|
-r <dir> Chroots directory
|
||||||
[default: /var/lib/manjaro-tools/buildpkg]
|
[default: /var/lib/manjaro-tools/buildpkg]
|
||||||
-i <pkg> Install a package into the working copy of the chroot
|
|
||||||
-c Recreate chroot
|
|
||||||
-w Clean up cache and sources
|
|
||||||
-n Install and run namcap check
|
|
||||||
-s Sign packages
|
-s Sign packages
|
||||||
-u udev base-devel group (no systemd)
|
-w Clean up cache and sources
|
||||||
-q Query settings and pretend build
|
|
||||||
-h This help
|
|
||||||
~~~
|
~~~
|
||||||
|
|
||||||
###### * build sysvinit package for both arches and branch testing:
|
###### * build sysvinit package for both arches and branch testing:
|
||||||
|
@ -181,16 +180,12 @@ The arch can also be set in manjaro-tools.conf, but under normal conditions, it
|
||||||
###### * -n
|
###### * -n
|
||||||
* Installs the built package in the chroot and runs a namcap check
|
* Installs the built package in the chroot and runs a namcap check
|
||||||
|
|
||||||
###### * -u
|
|
||||||
* Create udev build root (for eudev builds)
|
|
||||||
|
|
||||||
### 3. buildiso
|
### 3. buildiso
|
||||||
|
|
||||||
buildiso is used to build manjaro-iso-profiles. It is run insde the profiles folder.
|
buildiso is used to build manjaro-iso-profiles. It is run insde the profiles folder.
|
||||||
|
|
||||||
##### Packages for livecd only:
|
##### Packages for livecd only:
|
||||||
|
|
||||||
* manjaro-livecd-openrc
|
|
||||||
* manjaro-livecd-systemd
|
* manjaro-livecd-systemd
|
||||||
|
|
||||||
#### Arguments
|
#### Arguments
|
||||||
|
@ -198,28 +193,26 @@ buildiso is used to build manjaro-iso-profiles. It is run insde the profiles fol
|
||||||
~~~
|
~~~
|
||||||
$ buildiso -h
|
$ buildiso -h
|
||||||
Usage: buildiso [options]
|
Usage: buildiso [options]
|
||||||
-p <profile> Buildset or profile [default: default]
|
|
||||||
-a <arch> Arch [default: auto]
|
-a <arch> Arch [default: auto]
|
||||||
-b <branch> Branch [default: stable]
|
-b <branch> Branch [default: stable]
|
||||||
|
-c Disable clean work dir
|
||||||
|
-f Build full ISO (extra=true)
|
||||||
|
-g <key> The gpg key for sfs signing
|
||||||
|
[default: empty]
|
||||||
|
-h This help
|
||||||
|
-k <name> Kernel to use
|
||||||
|
[default: linux49]
|
||||||
|
-m Set SquashFS image mode to persistence
|
||||||
|
-p <profile> Buildset or profile [default: default]
|
||||||
|
-q Query settings and pretend build
|
||||||
-r <dir> Chroots directory
|
-r <dir> Chroots directory
|
||||||
[default: /var/lib/manjaro-tools/buildiso]
|
[default: /var/lib/manjaro-tools/buildiso]
|
||||||
-t <dir> Target directory
|
-t <dir> Target directory
|
||||||
[default: /var/cache/manjaro-tools/iso]
|
[default: /var/cache/manjaro-tools/iso]
|
||||||
-k <name> Kernel to use
|
-v Verbose output to log file, show profile detail (-q)
|
||||||
[default: linux49]
|
|
||||||
-i <name> Init system to use
|
|
||||||
[default: systemd]
|
|
||||||
-g <key> The gpg key for sfs signing
|
|
||||||
[default: empty]
|
|
||||||
-m Set SquashFS image mode to persistence
|
|
||||||
-c Disable clean work dir
|
|
||||||
-f Build full ISO (extra=true)
|
|
||||||
-x Build images only
|
-x Build images only
|
||||||
-z Generate iso only
|
-z Generate iso only
|
||||||
Requires pre built images (-x)
|
Requires pre built images (-x)
|
||||||
-v Verbose output to log file, show profile detail (-q)
|
|
||||||
-q Query settings and pretend build
|
|
||||||
-h This help
|
|
||||||
~~~
|
~~~
|
||||||
|
|
||||||
###### * build xfce iso profile for both arches and branch testing on x86_64 build system
|
###### * build xfce iso profile for both arches and branch testing on x86_64 build system
|
||||||
|
@ -256,15 +249,14 @@ yaml files are used by calamares netinstall option from a specified url(netgroup
|
||||||
~~~
|
~~~
|
||||||
$ check-yaml -h
|
$ check-yaml -h
|
||||||
Usage: check-yaml [options]
|
Usage: check-yaml [options]
|
||||||
-p <profile> Buildset or profile [default: default]
|
|
||||||
-a <arch> Arch [default: auto]
|
-a <arch> Arch [default: auto]
|
||||||
-k <name> Kernel to use[default: linux44]
|
|
||||||
-i <name> Init system to use [default: systemd]
|
|
||||||
-c Check also calamares yaml files generated for the profile
|
-c Check also calamares yaml files generated for the profile
|
||||||
-g Enable pacman group accepted for -p
|
-g Enable pacman group accepted for -p
|
||||||
-v Validate by schema
|
|
||||||
-q Query settings
|
|
||||||
-h This help
|
-h This help
|
||||||
|
-k <name> Kernel to use[default: linux44]
|
||||||
|
-p <profile> Buildset or profile [default: default]
|
||||||
|
-q Query settings
|
||||||
|
-v Validate by schema
|
||||||
~~~
|
~~~
|
||||||
###### * build xfce iso profile for both arches and branch testing on x86_64 build system
|
###### * build xfce iso profile for both arches and branch testing on x86_64 build system
|
||||||
|
|
||||||
|
@ -303,11 +295,11 @@ buildtree is a little tools to sync arch abs and manjaro PKGBUILD git repos.
|
||||||
~~~
|
~~~
|
||||||
$ buildtree -h
|
$ buildtree -h
|
||||||
Usage: buildtree [options]
|
Usage: buildtree [options]
|
||||||
-s Sync manjaro tree
|
|
||||||
-a Sync arch abs
|
-a Sync arch abs
|
||||||
-c Clean package tree
|
-c Clean package tree
|
||||||
-q Query settings
|
|
||||||
-h This help
|
-h This help
|
||||||
|
-q Query settings
|
||||||
|
-s Sync manjaro tree
|
||||||
~~~
|
~~~
|
||||||
|
|
||||||
###### * sync arch and manjaro trees
|
###### * sync arch and manjaro trees
|
||||||
|
@ -328,8 +320,8 @@ If there is only 1 system installed besides the host system, no list will pop up
|
||||||
$ manjaro-chroot -h
|
$ manjaro-chroot -h
|
||||||
usage: manjaro-chroot -a [or] manjaro-chroot chroot-dir [command]
|
usage: manjaro-chroot -a [or] manjaro-chroot chroot-dir [command]
|
||||||
-a Automount detected linux system
|
-a Automount detected linux system
|
||||||
-q Query settings and pretend
|
|
||||||
-h Print this help message
|
-h Print this help message
|
||||||
|
-q Query settings and pretend
|
||||||
|
|
||||||
If 'command' is unspecified, manjaro-chroot will launch /bin/sh.
|
If 'command' is unspecified, manjaro-chroot will launch /bin/sh.
|
||||||
|
|
||||||
|
@ -361,14 +353,14 @@ Ideally, you have a running ssh agent on the host, and your key added, and your
|
||||||
~~~
|
~~~
|
||||||
$ deployiso -h
|
$ deployiso -h
|
||||||
Usage: deployiso [options]
|
Usage: deployiso [options]
|
||||||
-p Source folder to upload [default:default]
|
|
||||||
-l Limit bandwidth in kB/s [default:80]
|
|
||||||
-c Create new remote release directory
|
-c Create new remote release directory
|
||||||
-u Update remote directory
|
|
||||||
-t Create iso torrent
|
|
||||||
-q Query settings and pretend upload
|
|
||||||
-v Verbose output
|
|
||||||
-h This help
|
-h This help
|
||||||
|
-l Limit bandwidth in kB/s [default:80]
|
||||||
|
-p Source folder to upload [default:default]
|
||||||
|
-q Query settings and pretend upload
|
||||||
|
-t Create iso torrent
|
||||||
|
-u Update remote directory
|
||||||
|
-v Verbose output
|
||||||
~~~
|
~~~
|
||||||
|
|
||||||
###### * upload official build list, ie all built iso defined in a build list
|
###### * upload official build list, ie all built iso defined in a build list
|
||||||
|
|
|
@ -44,15 +44,9 @@ show_profile(){
|
||||||
msg2 "addgroups: %s" "${addgroups}"
|
msg2 "addgroups: %s" "${addgroups}"
|
||||||
[[ -n ${smb_workgroup} ]] && msg2 "smb_workgroup: %s" "${smb_workgroup}"
|
[[ -n ${smb_workgroup} ]] && msg2 "smb_workgroup: %s" "${smb_workgroup}"
|
||||||
|
|
||||||
if [[ ${initsys} == 'systemd' ]]; then
|
msg2 "enable_systemd: %s" "${enable_systemd[*]}"
|
||||||
msg2 "enable_systemd: %s" "${enable_systemd[*]}"
|
msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
|
||||||
msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
|
[[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
|
||||||
[[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
|
|
||||||
else
|
|
||||||
msg2 "enable_openrc: %s" "${enable_openrc[*]}"
|
|
||||||
msg2 "enable_openrc_live: %s" "${enable_openrc_live[*]}"
|
|
||||||
[[ -n ${disable_openrc[*]} ]] && msg2 "disable_openrc: %s" "${disable_openrc[*]}"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
reset_profile
|
reset_profile
|
||||||
}
|
}
|
||||||
|
@ -69,7 +63,6 @@ display_settings(){
|
||||||
msg "OPTIONS:"
|
msg "OPTIONS:"
|
||||||
msg2 "arch: %s" "${target_arch}"
|
msg2 "arch: %s" "${target_arch}"
|
||||||
msg2 "branch: %s" "${target_branch}"
|
msg2 "branch: %s" "${target_branch}"
|
||||||
msg2 "initsys: %s" "${initsys}"
|
|
||||||
msg2 "kernel: %s" "${kernel}"
|
msg2 "kernel: %s" "${kernel}"
|
||||||
[[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
|
[[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
|
||||||
|
|
||||||
|
@ -118,8 +111,6 @@ usage() {
|
||||||
echo " [default: ${cache_dir_iso}]"
|
echo " [default: ${cache_dir_iso}]"
|
||||||
echo ' -k <name> Kernel to use'
|
echo ' -k <name> Kernel to use'
|
||||||
echo " [default: ${kernel}]"
|
echo " [default: ${kernel}]"
|
||||||
echo ' -i <name> Init system to use'
|
|
||||||
echo " [default: ${initsys}]"
|
|
||||||
echo ' -g <key> The gpg key for sfs signing'
|
echo ' -g <key> The gpg key for sfs signing'
|
||||||
echo " [default: ${gpgkey}]"
|
echo " [default: ${gpgkey}]"
|
||||||
echo ' -m Set SquashFS image mode to persistence'
|
echo ' -m Set SquashFS image mode to persistence'
|
||||||
|
@ -142,22 +133,21 @@ opts='p:a:b:r:t:k:i:g:cfzxmvqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
p) build_list_iso="$OPTARG" ;;
|
|
||||||
a) target_arch="$OPTARG" ;;
|
a) target_arch="$OPTARG" ;;
|
||||||
b) target_branch="$OPTARG" ;;
|
b) target_branch="$OPTARG" ;;
|
||||||
r) chroots_iso="$OPTARG" ;;
|
|
||||||
t) cache_dir_iso="$OPTARG" ;;
|
|
||||||
k) kernel="$OPTARG" ;;
|
|
||||||
i) initsys="$OPTARG" ;;
|
|
||||||
g) gpgkey="$OPTARG" ;;
|
|
||||||
c) clean_first=false ;;
|
c) clean_first=false ;;
|
||||||
f) full_iso=true ;;
|
f) full_iso=true ;;
|
||||||
|
g) gpgkey="$OPTARG" ;;
|
||||||
|
h|?) usage 0 ;;
|
||||||
|
k) kernel="$OPTARG" ;;
|
||||||
|
m) persist=true ;;
|
||||||
|
p) build_list_iso="$OPTARG" ;;
|
||||||
|
q) pretend=true ;;
|
||||||
|
r) chroots_iso="$OPTARG" ;;
|
||||||
|
t) cache_dir_iso="$OPTARG" ;;
|
||||||
|
v) verbose=true ;;
|
||||||
x) images_only=true ;;
|
x) images_only=true ;;
|
||||||
z) iso_only=true ;;
|
z) iso_only=true ;;
|
||||||
m) persist=true ;;
|
|
||||||
v) verbose=true ;;
|
|
||||||
q) pretend=true ;;
|
|
||||||
h|?) usage 0 ;;
|
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
|
@ -53,7 +53,6 @@ display_settings(){
|
||||||
msg2 "wipe_clean: %s" "${wipe_clean}"
|
msg2 "wipe_clean: %s" "${wipe_clean}"
|
||||||
msg2 "namcap: %s" "${namcap}"
|
msg2 "namcap: %s" "${namcap}"
|
||||||
msg2 "sign: %s" "${sign}"
|
msg2 "sign: %s" "${sign}"
|
||||||
msg2 "udev_root: %s" "${udev_root}"
|
|
||||||
|
|
||||||
msg "PATHS:"
|
msg "PATHS:"
|
||||||
msg2 "pkg_dir: %s" "${pkg_dir}"
|
msg2 "pkg_dir: %s" "${pkg_dir}"
|
||||||
|
@ -80,24 +79,22 @@ namcap=false
|
||||||
pretend=false
|
pretend=false
|
||||||
is_build_list=false
|
is_build_list=false
|
||||||
sign=false
|
sign=false
|
||||||
udev_root=false
|
|
||||||
is_multilib=false
|
is_multilib=false
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options]"
|
echo "Usage: ${0##*/} [options]"
|
||||||
echo " -p <pkg> Build list or pkg [default: ${build_list_pkg}]"
|
|
||||||
echo " -a <arch> Arch [default: ${target_arch}]"
|
echo " -a <arch> Arch [default: ${target_arch}]"
|
||||||
echo " -b <branch> Branch [default: ${target_branch}]"
|
echo " -b <branch> Branch [default: ${target_branch}]"
|
||||||
|
echo ' -c Recreate chroot'
|
||||||
|
echo ' -h This help'
|
||||||
|
echo ' -i <pkgs> Install packages into the working copy of the chroot'
|
||||||
|
echo ' -n Install and run namcap check'
|
||||||
|
echo " -p <pkg> Build list or pkg [default: ${build_list_pkg}]"
|
||||||
|
echo ' -q Query settings and pretend build'
|
||||||
echo ' -r <dir> Chroots directory'
|
echo ' -r <dir> Chroots directory'
|
||||||
echo " [default: ${chroots_pkg}]"
|
echo " [default: ${chroots_pkg}]"
|
||||||
echo ' -i <pkgs> Install packages into the working copy of the chroot'
|
|
||||||
echo ' -c Recreate chroot'
|
|
||||||
echo ' -w Clean up cache and sources'
|
|
||||||
echo ' -n Install and run namcap check'
|
|
||||||
echo ' -s Sign packages'
|
echo ' -s Sign packages'
|
||||||
echo ' -u Udev base-devel group (no systemd)'
|
echo ' -w Clean up cache and sources'
|
||||||
echo ' -q Query settings and pretend build'
|
|
||||||
echo ' -h This help'
|
|
||||||
echo ''
|
echo ''
|
||||||
echo ''
|
echo ''
|
||||||
exit $1
|
exit $1
|
||||||
|
@ -109,18 +106,17 @@ opts='p:a:b:r:i:cwnsuqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
p) build_list_pkg="${OPTARG%/}" ;;
|
|
||||||
a) target_arch="$OPTARG" ;;
|
a) target_arch="$OPTARG" ;;
|
||||||
b) target_branch="$OPTARG" ;;
|
b) target_branch="$OPTARG" ;;
|
||||||
r) chroots_pkg="$OPTARG" ;;
|
|
||||||
i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
|
|
||||||
c) clean_first=true ;;
|
c) clean_first=true ;;
|
||||||
w) wipe_clean=true ;;
|
|
||||||
n) namcap=true; mkchrootpkg_args+=(-n) ;;
|
|
||||||
s) sign=true ;;
|
|
||||||
u) udev_root=true ;;
|
|
||||||
q) pretend=true ;;
|
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
|
i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
|
||||||
|
n) namcap=true; mkchrootpkg_args+=(-n) ;;
|
||||||
|
p) build_list_pkg="${OPTARG%/}" ;;
|
||||||
|
q) pretend=true ;;
|
||||||
|
r) chroots_pkg="$OPTARG" ;;
|
||||||
|
s) sign=true ;;
|
||||||
|
w) wipe_clean=true ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
|
@ -44,15 +44,9 @@ show_profile(){
|
||||||
msg2 "login_shell: %s" "${login_shell}"
|
msg2 "login_shell: %s" "${login_shell}"
|
||||||
msg2 "addgroups: %s" "${addgroups}"
|
msg2 "addgroups: %s" "${addgroups}"
|
||||||
|
|
||||||
if [[ ${initsys} == 'systemd' ]]; then
|
msg2 "enable_systemd: %s" "${enable_systemd[*]}"
|
||||||
msg2 "enable_systemd: %s" "${enable_systemd[*]}"
|
msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
|
||||||
msg2 "enable_systemd_live: %s" "${enable_systemd_live[*]}"
|
[[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
|
||||||
[[ -n ${disable_systemd[*]} ]] && msg2 "disable_systemd: %s" "${disable_systemd[*]}"
|
|
||||||
else
|
|
||||||
msg2 "enable_openrc: %s" "${enable_openrc[*]}"
|
|
||||||
msg2 "enable_openrc_live: %s" "${enable_openrc_live[*]}"
|
|
||||||
[[ -n ${disable_openrc[*]} ]] && msg2 "disable_openrc: %s" "${disable_openrc[*]}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
reset_profile
|
reset_profile
|
||||||
unset yaml_dir
|
unset yaml_dir
|
||||||
|
@ -69,7 +63,6 @@ display_settings(){
|
||||||
|
|
||||||
msg "OPTIONS:"
|
msg "OPTIONS:"
|
||||||
msg2 "arch: %s" "${target_arch}"
|
msg2 "arch: %s" "${target_arch}"
|
||||||
msg2 "initsys: %s" "${initsys}"
|
|
||||||
msg2 "kernel: %s" "${kernel}"
|
msg2 "kernel: %s" "${kernel}"
|
||||||
|
|
||||||
msg "ARGS:"
|
msg "ARGS:"
|
||||||
|
@ -98,15 +91,14 @@ cache_dir_netinstall="${cache_dir}/netinstall"
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options]"
|
echo "Usage: ${0##*/} [options]"
|
||||||
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
|
|
||||||
echo " -a <arch> Arch [default: ${target_arch}]"
|
echo " -a <arch> Arch [default: ${target_arch}]"
|
||||||
echo " -k <name> Kernel to use[default: ${kernel}]"
|
|
||||||
echo " -i <name> Init system to use [default: ${initsys}]"
|
|
||||||
echo ' -c Check also calamares yaml files generated for the profile'
|
echo ' -c Check also calamares yaml files generated for the profile'
|
||||||
echo ' -g Enable pacman group accepted for -p'
|
echo ' -g Enable pacman group accepted for -p'
|
||||||
echo ' -v Validate by schema'
|
|
||||||
echo ' -q Query settings'
|
|
||||||
echo ' -h This help'
|
echo ' -h This help'
|
||||||
|
echo " -k <name> Kernel to use[default: ${kernel}]"
|
||||||
|
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
|
||||||
|
echo ' -q Query settings'
|
||||||
|
echo ' -v Validate by schema'
|
||||||
echo ''
|
echo ''
|
||||||
echo ''
|
echo ''
|
||||||
exit $1
|
exit $1
|
||||||
|
@ -118,15 +110,14 @@ opts='p:a:i:k:gcvqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
p) build_list_iso="$OPTARG" ;;
|
|
||||||
a) target_arch="$OPTARG" ;;
|
a) target_arch="$OPTARG" ;;
|
||||||
i) initsys="$OPTARG" ;;
|
|
||||||
k) kernel="$OPTARG" ;;
|
|
||||||
c) calamares=true ;;
|
c) calamares=true ;;
|
||||||
g) group=true ;;
|
g) group=true ;;
|
||||||
v) validate=true ;;
|
|
||||||
q) pretend=true ;;
|
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
|
k) kernel="$OPTARG" ;;
|
||||||
|
p) build_list_iso="$OPTARG" ;;
|
||||||
|
q) pretend=true ;;
|
||||||
|
v) validate=true ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
autoconf
|
|
||||||
automake
|
|
||||||
binutils
|
|
||||||
bison
|
|
||||||
libeudev
|
|
||||||
fakeroot
|
|
||||||
file
|
|
||||||
findutils
|
|
||||||
flex
|
|
||||||
gawk
|
|
||||||
gcc
|
|
||||||
gettext
|
|
||||||
grep
|
|
||||||
groff
|
|
||||||
gzip
|
|
||||||
libtool
|
|
||||||
m4
|
|
||||||
make
|
|
||||||
pacman
|
|
||||||
patch
|
|
||||||
pkg-config
|
|
||||||
sed
|
|
||||||
sudo
|
|
||||||
texinfo
|
|
||||||
util-linux-nosystemd
|
|
||||||
which
|
|
||||||
>multilib gcc-multilib
|
|
||||||
>multilib lib32-fakeroot
|
|
||||||
>multilib lib32-libltdl
|
|
|
@ -23,7 +23,7 @@
|
||||||
################ buildtree ###############
|
################ buildtree ###############
|
||||||
|
|
||||||
# manjaro package tree
|
# manjaro package tree
|
||||||
# repo_tree=('core' 'extra' 'community' 'multilib' 'openrc')
|
# repo_tree=('core' 'extra' 'community' 'multilib')
|
||||||
|
|
||||||
# host_tree=https://github.com/manjaro
|
# host_tree=https://github.com/manjaro
|
||||||
|
|
||||||
|
|
|
@ -58,8 +58,3 @@
|
||||||
# names must match systemd service names
|
# names must match systemd service names
|
||||||
# services in enable_systemd array don't need to be listed here
|
# services in enable_systemd array don't need to be listed here
|
||||||
# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
|
# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
|
||||||
|
|
||||||
# unset defaults to given values,
|
|
||||||
# names must match openrc service names
|
|
||||||
# services in enable_openrc array don't need to be listed here
|
|
||||||
# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
|
|
||||||
|
|
|
@ -115,12 +115,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||||
<listitem><para>Help.</para></listitem>
|
<listitem><para>Help.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><option>-i systemd|openrc</option></term>
|
|
||||||
|
|
||||||
<listitem><para>The init system on the iso</para></listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-k linuxXXX</option></term>
|
<term><option>-k linuxXXX</option></term>
|
||||||
|
|
||||||
|
|
|
@ -81,12 +81,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||||
<listitem><para>Architecture that the yaml will be created for. Can be i686 or x86_64.</para></listitem>
|
<listitem><para>Architecture that the yaml will be created for. Can be i686 or x86_64.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><option>-i systemd|openrc</option></term>
|
|
||||||
|
|
||||||
<listitem><para>The init system the yaml will be created for.</para></listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>-k linuxXXX</option></term>
|
<term><option>-k linuxXXX</option></term>
|
||||||
|
|
||||||
|
|
|
@ -132,7 +132,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||||
<term><varname>repo_tree=</varname></term>
|
<term><varname>repo_tree=</varname></term>
|
||||||
|
|
||||||
<listitem><para>Manjaro package tree. Default is
|
<listitem><para>Manjaro package tree. Default is
|
||||||
"('core' 'extra' 'community' 'multilib' 'openrc')".
|
"('core' 'extra' 'community' 'multilib')".
|
||||||
</para></listitem>
|
</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
|
|
@ -152,14 +152,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||||
</para></listitem>
|
</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><varname>enable_openrc=</varname></term>
|
|
||||||
|
|
||||||
<listitem><para>Array of services that will be
|
|
||||||
enabled in openrc systems.
|
|
||||||
</para></listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>hostname=</varname></term>
|
<term><varname>hostname=</varname></term>
|
||||||
|
|
||||||
|
@ -209,14 +201,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||||
</para></listitem>
|
</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><varname>enable_openrc_live=</varname></term>
|
|
||||||
|
|
||||||
<listitem><para>Array of services that will be
|
|
||||||
enabled in the openrc live-cd.
|
|
||||||
</para></listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
</variablelist>
|
</variablelist>
|
||||||
|
|
||||||
</refsect1>
|
</refsect1>
|
||||||
|
|
|
@ -91,7 +91,7 @@ configure_lsb(){
|
||||||
|
|
||||||
configure_logind(){
|
configure_logind(){
|
||||||
msg2 "Configuring logind ..."
|
msg2 "Configuring logind ..."
|
||||||
local conf=$1/etc/$2/logind.conf
|
local conf=$1/etc/systemd/logind.conf
|
||||||
sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
|
sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
|
||||||
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
|
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
|
||||||
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
|
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
|
||||||
|
@ -104,27 +104,14 @@ configure_journald(){
|
||||||
}
|
}
|
||||||
|
|
||||||
configure_services(){
|
configure_services(){
|
||||||
info "Configuring [%s]" "${initsys}"
|
info "Configuring services"
|
||||||
case ${initsys} in
|
for svc in ${enable_systemd[@]}; do
|
||||||
'openrc')
|
add_svc_sd "$1" "$svc"
|
||||||
for svc in ${enable_openrc[@]}; do
|
done
|
||||||
[[ $svc == "xdm" ]] && set_xdm "$1"
|
for svc in ${enable_systemd_live[@]}; do
|
||||||
add_svc_rc "$1" "$svc"
|
add_svc_sd "$1" "$svc"
|
||||||
done
|
done
|
||||||
for svc in ${enable_openrc_live[@]}; do
|
info "Done configuring services"
|
||||||
add_svc_rc "$1" "$svc"
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
'systemd')
|
|
||||||
for svc in ${enable_systemd[@]}; do
|
|
||||||
add_svc_sd "$1" "$svc"
|
|
||||||
done
|
|
||||||
for svc in ${enable_systemd_live[@]}; do
|
|
||||||
add_svc_sd "$1" "$svc"
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
info "Done configuring [%s]" "${initsys}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
write_live_session_conf(){
|
write_live_session_conf(){
|
||||||
|
@ -160,24 +147,15 @@ configure_hosts(){
|
||||||
}
|
}
|
||||||
|
|
||||||
configure_system(){
|
configure_system(){
|
||||||
case ${initsys} in
|
configure_logind "$1"
|
||||||
'systemd')
|
configure_journald "$1"
|
||||||
configure_logind "$1" "systemd"
|
|
||||||
configure_journald "$1"
|
|
||||||
|
|
||||||
# Prevent some services to be started in the livecd
|
# Prevent some services to be started in the livecd
|
||||||
echo 'File created by manjaro-tools. See systemd-update-done.service(8).' \
|
echo 'File created by manjaro-tools. See systemd-update-done.service(8).' \
|
||||||
| tee "${path}/etc/.updated" >"${path}/var/.updated"
|
| tee "${path}/etc/.updated" >"${path}/var/.updated"
|
||||||
|
|
||||||
msg2 "Disable systemd-gpt-auto-generator"
|
msg2 "Disable systemd-gpt-auto-generator"
|
||||||
ln -sf /dev/null "${path}/usr/lib/systemd/system-generators/systemd-gpt-auto-generator"
|
ln -sf /dev/null "${path}/usr/lib/systemd/system-generators/systemd-gpt-auto-generator"
|
||||||
;;
|
|
||||||
'openrc')
|
|
||||||
configure_logind "$1" "elogind"
|
|
||||||
# local hn='hostname="'${hostname}'"'
|
|
||||||
# sed -i -e "s|^.*hostname=.*|${hn}|" $1/etc/conf.d/hostname
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
echo ${hostname} > $1/etc/hostname
|
echo ${hostname} > $1/etc/hostname
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -219,7 +219,6 @@ gen_iso_fn(){
|
||||||
if ! ${chrootcfg}; then
|
if ! ${chrootcfg}; then
|
||||||
[[ -n ${profile} ]] && vars+=("${profile}")
|
[[ -n ${profile} ]] && vars+=("${profile}")
|
||||||
fi
|
fi
|
||||||
[[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
|
|
||||||
vars+=("${dist_release}")
|
vars+=("${dist_release}")
|
||||||
vars+=("${target_branch}")
|
vars+=("${target_branch}")
|
||||||
|
|
||||||
|
@ -380,8 +379,7 @@ make_image_boot() {
|
||||||
|
|
||||||
configure_grub(){
|
configure_grub(){
|
||||||
local default_args="misobasedir=${iso_name} misolabel=${iso_label}" \
|
local default_args="misobasedir=${iso_name} misolabel=${iso_label}" \
|
||||||
boot_args=('quiet')
|
boot_args=('quiet' 'systemd.show_status=1')
|
||||||
[[ ${initsys} == 'systemd' ]] && boot_args+=('systemd.show_status=1')
|
|
||||||
|
|
||||||
sed -e "s|@DIST_NAME@|${dist_name}|g" \
|
sed -e "s|@DIST_NAME@|${dist_name}|g" \
|
||||||
-e "s|@ARCH@|${target_arch}|g" \
|
-e "s|@ARCH@|${target_arch}|g" \
|
||||||
|
@ -420,10 +418,6 @@ check_requirements(){
|
||||||
die "%s is not a valid branch!" "${target_branch}"
|
die "%s is not a valid branch!" "${target_branch}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! is_valid_init "${initsys}"; then
|
|
||||||
die "%s is not a valid init system!" "${initsys}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
local iso_kernel=${kernel:5:1} host_kernel=$(uname -r)
|
local iso_kernel=${kernel:5:1} host_kernel=$(uname -r)
|
||||||
if [[ ${iso_kernel} < "4" ]] \
|
if [[ ${iso_kernel} < "4" ]] \
|
||||||
|| [[ ${host_kernel%%*.} < "4" ]]; then
|
|| [[ ${host_kernel%%*.} < "4" ]]; then
|
||||||
|
|
|
@ -69,39 +69,11 @@ find_pkg(){
|
||||||
[[ -z $result ]] && die "%s is not a valid package or build list!" "$1"
|
[[ -z $result ]] && die "%s is not a valid package or build list!" "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
load_group(){
|
|
||||||
local _multi \
|
|
||||||
_space="s| ||g" \
|
|
||||||
_clean=':a;N;$!ba;s/\n/ /g' \
|
|
||||||
_com_rm="s|#.*||g" \
|
|
||||||
devel_group='' \
|
|
||||||
file=${DATADIR}/base-devel-udev
|
|
||||||
|
|
||||||
info "Loading custom group: %s" "$file"
|
|
||||||
|
|
||||||
if ${is_multilib}; then
|
|
||||||
_multi="s|>multilib||g"
|
|
||||||
else
|
|
||||||
_multi="s|>multilib.*||g"
|
|
||||||
fi
|
|
||||||
|
|
||||||
devel_group=$(sed "$_com_rm" "$file" \
|
|
||||||
| sed "$_space" \
|
|
||||||
| sed "$_multi" \
|
|
||||||
| sed "$_clean")
|
|
||||||
|
|
||||||
echo ${devel_group}
|
|
||||||
}
|
|
||||||
|
|
||||||
init_base_devel(){
|
init_base_devel(){
|
||||||
if ${udev_root}; then
|
if ${is_multilib}; then
|
||||||
base_packages=( "$(load_group)" )
|
base_packages=('base-devel' 'multilib-devel')
|
||||||
else
|
else
|
||||||
if ${is_multilib}; then
|
base_packages=('base-devel')
|
||||||
base_packages=('base-devel' 'multilib-devel')
|
|
||||||
else
|
|
||||||
base_packages=('base-devel')
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,19 +13,16 @@ write_machineid_conf(){
|
||||||
local conf="${modules_dir}/machineid.conf" switch='false'
|
local conf="${modules_dir}/machineid.conf" switch='false'
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
msg2 "Writing %s ..." "${conf##*/}"
|
||||||
echo '---' > "$conf"
|
echo '---' > "$conf"
|
||||||
[[ ${initsys} == 'systemd' ]] && switch='true'
|
|
||||||
echo "systemd: ${switch}" >> $conf
|
|
||||||
echo "dbus: true" >> $conf
|
echo "dbus: true" >> $conf
|
||||||
echo "symlink: true" >> $conf
|
echo "symlink: true" >> $conf
|
||||||
}
|
}
|
||||||
|
|
||||||
write_finished_conf(){
|
write_finished_conf(){
|
||||||
msg2 "Writing %s ..." "finished.conf"
|
msg2 "Writing %s ..." "finished.conf"
|
||||||
local conf="${modules_dir}/finished.conf" cmd="loginctl reboot"
|
local conf="${modules_dir}/finished.conf" cmd="systemctl reboot"
|
||||||
echo '---' > "$conf"
|
echo '---' > "$conf"
|
||||||
echo 'restartNowEnabled: true' >> "$conf"
|
echo 'restartNowEnabled: true' >> "$conf"
|
||||||
echo 'restartNowChecked: false' >> "$conf"
|
echo 'restartNowChecked: false' >> "$conf"
|
||||||
[[ ${initsys} == 'systemd' ]] && cmd="systemctl reboot"
|
|
||||||
echo "restartNowCommand: \"${cmd}\"" >> "$conf"
|
echo "restartNowCommand: \"${cmd}\"" >> "$conf"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,18 +65,6 @@ write_servicescfg_conf(){
|
||||||
echo '' >> "$conf"
|
echo '' >> "$conf"
|
||||||
echo 'services:' >> "$conf"
|
echo 'services:' >> "$conf"
|
||||||
echo ' enabled:' >> "$conf"
|
echo ' enabled:' >> "$conf"
|
||||||
for s in ${enable_openrc[@]};do
|
|
||||||
echo " - name: $s" >> "$conf"
|
|
||||||
echo ' runlevel: default' >> "$conf"
|
|
||||||
done
|
|
||||||
if [[ -n ${disable_openrc[@]} ]]; then
|
|
||||||
echo ' disabled:' >> "$conf"
|
|
||||||
for s in ${disable_openrc[@]};do
|
|
||||||
echo " - name: $s" >> "$conf"
|
|
||||||
echo ' runlevel: default' >> "$conf"
|
|
||||||
echo '' >> "$conf"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
write_services_conf(){
|
write_services_conf(){
|
||||||
|
@ -245,7 +230,7 @@ get_yaml(){
|
||||||
else
|
else
|
||||||
args+=("${profile}/packages")
|
args+=("${profile}/packages")
|
||||||
fi
|
fi
|
||||||
args+=("${initsys}")
|
args+=("systemd")
|
||||||
for arg in ${args[@]};do
|
for arg in ${args[@]};do
|
||||||
yaml=${yaml:-}${yaml:+-}${arg}
|
yaml=${yaml:-}${yaml:+-}${arg}
|
||||||
done
|
done
|
||||||
|
@ -340,10 +325,7 @@ write_settings_conf(){
|
||||||
msg2 "Skipping to set mhwdcfg module."
|
msg2 "Skipping to set mhwdcfg module."
|
||||||
fi
|
fi
|
||||||
echo " - hwclock" >> "$conf"
|
echo " - hwclock" >> "$conf"
|
||||||
case ${initsys} in
|
echo " - services" >> "$conf" && write_services_conf
|
||||||
'systemd') echo " - services" >> "$conf" && write_services_conf ;;
|
|
||||||
'openrc') echo " - servicescfg" >> "$conf" && write_servicescfg_conf ;;
|
|
||||||
esac
|
|
||||||
echo " - grubcfg" >> "$conf"
|
echo " - grubcfg" >> "$conf"
|
||||||
echo " - bootloader" >> "$conf" && write_bootloader_conf
|
echo " - bootloader" >> "$conf" && write_bootloader_conf
|
||||||
if ${oem_used}; then
|
if ${oem_used}; then
|
||||||
|
@ -440,7 +422,7 @@ prepare_check(){
|
||||||
}
|
}
|
||||||
|
|
||||||
gen_fn(){
|
gen_fn(){
|
||||||
echo "${yaml_dir}/$1-${target_arch}-${initsys}.yaml"
|
echo "${yaml_dir}/$1-${target_arch}-systemd.yaml"
|
||||||
}
|
}
|
||||||
|
|
||||||
make_profile_yaml(){
|
make_profile_yaml(){
|
||||||
|
|
26
lib/util.sh
26
lib/util.sh
|
@ -221,7 +221,7 @@ init_buildtree(){
|
||||||
|
|
||||||
tree_dir_abs=${tree_dir}/packages-archlinux
|
tree_dir_abs=${tree_dir}/packages-archlinux
|
||||||
|
|
||||||
[[ -z ${repo_tree[@]} ]] && repo_tree=('core' 'extra' 'community' 'multilib' 'openrc')
|
[[ -z ${repo_tree[@]} ]] && repo_tree=('core' 'extra' 'community' 'multilib')
|
||||||
|
|
||||||
[[ -z ${host_tree} ]] && host_tree='https://github.com/manjaro'
|
[[ -z ${host_tree} ]] && host_tree='https://github.com/manjaro'
|
||||||
|
|
||||||
|
@ -313,8 +313,6 @@ init_buildiso(){
|
||||||
|
|
||||||
iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
|
iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
|
||||||
|
|
||||||
[[ -z ${initsys} ]] && initsys="systemd"
|
|
||||||
|
|
||||||
[[ -z ${kernel} ]] && kernel="linux414"
|
[[ -z ${kernel} ]] && kernel="linux414"
|
||||||
|
|
||||||
[[ -z ${gpgkey} ]] && gpgkey=''
|
[[ -z ${gpgkey} ]] && gpgkey=''
|
||||||
|
@ -449,10 +447,7 @@ reset_profile(){
|
||||||
unset addgroups
|
unset addgroups
|
||||||
unset enable_systemd
|
unset enable_systemd
|
||||||
unset disable_systemd
|
unset disable_systemd
|
||||||
unset enable_openrc
|
|
||||||
unset disable_openrc
|
|
||||||
unset enable_systemd_live
|
unset enable_systemd_live
|
||||||
unset enable_openrc_live
|
|
||||||
unset packages_desktop
|
unset packages_desktop
|
||||||
unset packages_mhwd
|
unset packages_mhwd
|
||||||
unset login_shell
|
unset login_shell
|
||||||
|
@ -504,18 +499,6 @@ check_profile(){
|
||||||
load_pkgs(){
|
load_pkgs(){
|
||||||
info "Loading Packages: [%s] ..." "${1##*/}"
|
info "Loading Packages: [%s] ..." "${1##*/}"
|
||||||
|
|
||||||
local _init _init_rm
|
|
||||||
case "${initsys}" in
|
|
||||||
'openrc')
|
|
||||||
_init="s|>openrc||g"
|
|
||||||
_init_rm="s|>systemd.*||g"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
_init="s|>systemd||g"
|
|
||||||
_init_rm="s|>openrc.*||g"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
local _multi _nonfree_default _nonfree_multi _arch _arch_rm _nonfree_i686 _nonfree_x86_64 _basic _basic_rm _extra _extra_rm
|
local _multi _nonfree_default _nonfree_multi _arch _arch_rm _nonfree_i686 _nonfree_x86_64 _basic _basic_rm _extra _extra_rm
|
||||||
|
|
||||||
if ${basic}; then
|
if ${basic}; then
|
||||||
|
@ -717,13 +700,6 @@ create_min_fs(){
|
||||||
mkdir -m 0555 -p $1/{sys,proc}
|
mkdir -m 0555 -p $1/{sys,proc}
|
||||||
}
|
}
|
||||||
|
|
||||||
is_valid_init(){
|
|
||||||
case $1 in
|
|
||||||
'openrc'|'systemd') return 0 ;;
|
|
||||||
*) return 1 ;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
is_valid_arch_pkg(){
|
is_valid_arch_pkg(){
|
||||||
eval "case $1 in
|
eval "case $1 in
|
||||||
$(show_build_profiles "${make_conf_dir}")) return 0 ;;
|
$(show_build_profiles "${make_conf_dir}")) return 0 ;;
|
||||||
|
|
Loading…
Reference in a new issue