Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
398e91bdd9 | ||
![]() |
d1f4c03e05 | ||
![]() |
180decbc5e | ||
![]() |
943c0c36ea | ||
![]() |
60116e9f93 | ||
![]() |
eea5d31427 | ||
![]() |
d05e8700ef | ||
![]() |
1d310e18e9 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -4,3 +4,5 @@
|
||||
.kateproject.d
|
||||
data/schemas/*.conf
|
||||
.project
|
||||
iso-profiles
|
||||
live-services
|
||||
|
@@ -46,7 +46,7 @@ update_repo(){
|
||||
fi
|
||||
done
|
||||
cd $repo_path
|
||||
repo-$action -R $repo.$ext ${packages[@]}
|
||||
[[ -n $action ]] && repo-$action -R $repo.$ext ${packages[@]}
|
||||
return 0
|
||||
}
|
||||
|
||||
|
@@ -156,9 +156,10 @@ prepare_chroot() {
|
||||
# We can't use useradd without chrooting, otherwise it invokes PAM modules
|
||||
# which we might not be able to load (i.e. when building i686 packages on
|
||||
# an x86_64 host).
|
||||
sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,group}
|
||||
sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,shadow,group}
|
||||
printf >>"$copydir/etc/group" 'builduser:x:%d:\n' $builduser_gid
|
||||
printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' $builduser_uid $builduser_gid
|
||||
printf >>"$copydir/etc/shadow" 'builduser:!!:%d::::::\n' "$(( $(date -u +%s) / 86400 ))"
|
||||
|
||||
$install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
|
||||
|
||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
||||
|
||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||
# keyring can then be populated with the keys of all official Artix Linux
|
||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
||||
# packagers with `pacman-key --populate archlinux artix`.
|
||||
|
||||
#
|
||||
# REPOSITORIES
|
||||
@@ -63,6 +63,14 @@ LocalFileSigLevel = Optional
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
|
||||
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||
# repo name header and Include lines. You can add preferred servers immediately
|
||||
# after the header, and they will be used before the default mirrors.
|
||||
|
||||
#[gremlins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[system]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
@@ -70,15 +78,45 @@ Include = /etc/pacman.d/mirrorlist
|
||||
[world]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#[galaxy-gremlins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[galaxy]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# If you want to run 32 bit applications on your x86_64 system,
|
||||
# enable the lib32 repositories as required here.
|
||||
|
||||
#[lib32-gremlins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#[lib32]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
#[custom]
|
||||
#SigLevel = Optional TrustAll
|
||||
#Server = file:///home/custompkgs
|
||||
|
||||
#
|
||||
# ARCHLINUX
|
||||
#
|
||||
|
||||
#[testing]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
[extra]
|
||||
Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[community-testing]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
[community]
|
||||
Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[multilib-testing]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[multilib]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
||||
|
||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||
# keyring can then be populated with the keys of all official Artix Linux
|
||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
||||
# packagers with `pacman-key --populate archlinux artix`.
|
||||
|
||||
#
|
||||
# REPOSITORIES
|
||||
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
|
||||
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||
# repo name header and Include lines. You can add preferred servers immediately
|
||||
# after the header, and they will be used before the default mirrors.
|
||||
|
||||
[goblins]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
@@ -85,6 +90,24 @@ Include = /etc/pacman.d/mirrorlist
|
||||
[galaxy]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# If you want to run 32 bit applications on your x86_64 system,
|
||||
# enable the lib32 repositories as required here.
|
||||
|
||||
#[lib32-goblins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#[lib32-gremlins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#[lib32]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
#[custom]
|
||||
#SigLevel = Optional TrustAll
|
||||
#Server = file:///home/custompkgs
|
||||
|
||||
#
|
||||
# ARCHLINUX
|
||||
#
|
||||
@@ -106,3 +129,12 @@ Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
[community]
|
||||
Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[multilib-staging]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[multilib-testing]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[multilib]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
||||
|
||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||
# keyring can then be populated with the keys of all official Artix Linux
|
||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
||||
# packagers with `pacman-key --populate archlinux artix`.
|
||||
|
||||
#
|
||||
# REPOSITORIES
|
||||
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
|
||||
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||
# repo name header and Include lines. You can add preferred servers immediately
|
||||
# after the header, and they will be used before the default mirrors.
|
||||
|
||||
[gremlins]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
@@ -79,6 +84,21 @@ Include = /etc/pacman.d/mirrorlist
|
||||
[galaxy]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# If you want to run 32 bit applications on your x86_64 system,
|
||||
# enable the lib32 repositories as required here.
|
||||
|
||||
#[lib32-gremlins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#[lib32]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
#[custom]
|
||||
#SigLevel = Optional TrustAll
|
||||
#Server = file:///home/custompkgs
|
||||
|
||||
#
|
||||
# ARCHLINUX
|
||||
#
|
||||
@@ -94,3 +114,9 @@ Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
[community]
|
||||
Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[multilib-testing]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[multilib]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
||||
|
||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||
# keyring can then be populated with the keys of all official Artix Linux
|
||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
||||
# packagers with `pacman-key --populate archlinux artix`.
|
||||
|
||||
#
|
||||
# REPOSITORIES
|
||||
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
|
||||
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||
# repo name header and Include lines. You can add preferred servers immediately
|
||||
# after the header, and they will be used before the default mirrors.
|
||||
|
||||
[goblins]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
@@ -85,6 +90,9 @@ Include = /etc/pacman.d/mirrorlist
|
||||
[galaxy]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# If you want to run 32 bit applications on your x86_64 system,
|
||||
# enable the lib32 repositories as required here.
|
||||
|
||||
[lib32-goblins]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
@@ -94,7 +102,13 @@ Include = /etc/pacman.d/mirrorlist
|
||||
[lib32]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
#[custom]
|
||||
#SigLevel = Optional TrustAll
|
||||
#Server = file:///home/custompkgs
|
||||
|
||||
#
|
||||
# ARCHLINUX
|
||||
#
|
||||
|
||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
||||
|
||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||
# keyring can then be populated with the keys of all official Artix Linux
|
||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
||||
# packagers with `pacman-key --populate archlinux artix`.
|
||||
|
||||
#
|
||||
# REPOSITORIES
|
||||
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
|
||||
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||
# repo name header and Include lines. You can add preferred servers immediately
|
||||
# after the header, and they will be used before the default mirrors.
|
||||
|
||||
[gremlins]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
@@ -79,13 +84,22 @@ Include = /etc/pacman.d/mirrorlist
|
||||
[galaxy]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# If you want to run 32 bit applications on your x86_64 system,
|
||||
# enable the lib32 repositories as required here.
|
||||
|
||||
[lib32-gremlins]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[lib32]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
#[custom]
|
||||
#SigLevel = Optional TrustAll
|
||||
#Server = file:///home/custompkgs
|
||||
|
||||
#
|
||||
# ARCHLINUX
|
||||
#
|
||||
|
||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
||||
|
||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||
# keyring can then be populated with the keys of all official Artix Linux
|
||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
||||
# packagers with `pacman-key --populate archlinux artix`.
|
||||
|
||||
#
|
||||
# REPOSITORIES
|
||||
@@ -63,6 +63,14 @@ LocalFileSigLevel = Optional
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
|
||||
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||
# repo name header and Include lines. You can add preferred servers immediately
|
||||
# after the header, and they will be used before the default mirrors.
|
||||
|
||||
#[gremlins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[system]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
@@ -70,21 +78,45 @@ Include = /etc/pacman.d/mirrorlist
|
||||
[world]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#[galaxy-gremlins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[galaxy]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# If you want to run 32 bit applications on your x86_64 system,
|
||||
# enable the lib32 repositories as required here.
|
||||
|
||||
#[lib32-gremlins]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[lib32]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
#
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
#[custom]
|
||||
#SigLevel = Optional TrustAll
|
||||
#Server = file:///home/custompkgs
|
||||
|
||||
#
|
||||
# ARCHLINUX
|
||||
#
|
||||
|
||||
#[testing]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
[extra]
|
||||
Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[community-testing]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
[community]
|
||||
Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
#[multilib-testing]
|
||||
#Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
||||
[multilib]
|
||||
Include = /etc/pacman.d/mirrorlist-arch
|
||||
|
@@ -8,29 +8,34 @@
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
init_profile(){
|
||||
local profdir="$1" prof="$2"
|
||||
|
||||
root_list="$profdir/base/Packages-Root"
|
||||
root_overlay="$profdir/base/root-overlay"
|
||||
live_list="$profdir/base/Packages-Live"
|
||||
live_overlay="$profdir/base/live-overlay"
|
||||
|
||||
[[ -f "$profdir/$prof/Packages-Root" ]] && root_list="$profdir/$prof/Packages-Root"
|
||||
[[ -d "$profdir/$prof/root-overlay" ]] && root_overlay="$profdir/$prof/root-overlay"
|
||||
|
||||
[[ -f "$profdir/$prof/Packages-Desktop" ]] && desktop_list="$profdir/$prof/Packages-Desktop"
|
||||
[[ -d "$profdir/$prof/desktop-overlay" ]] && desktop_overlay="$profdir/$prof/desktop-overlay"
|
||||
|
||||
[[ -f "$profdir/$prof/Packages-Live" ]] && live_list="$profdir/$prof/Packages-Live"
|
||||
[[ -d "$profdir/$prof/live-overlay" ]] && live_overlay="$profdir/$prof/live-overlay"
|
||||
}
|
||||
|
||||
load_profile(){
|
||||
local prof="$1"
|
||||
local profdir="${DATADIR}/iso-profiles/$prof"
|
||||
[[ "$prof" != 'base' ]] && profdir=${workspace_dir}/iso-profiles/$prof
|
||||
local profdir="${DATADIR}/iso-profiles"
|
||||
[[ -d ${workspace_dir}/iso-profiles ]] && profdir=${workspace_dir}/iso-profiles
|
||||
|
||||
root_list="${DATADIR}/iso-profiles/base/Packages-Root"
|
||||
[[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
|
||||
init_profile "$profdir" "$prof"
|
||||
|
||||
root_overlay="${DATADIR}/iso-profiles/base/root-overlay"
|
||||
[[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
|
||||
[[ -f $profdir/$prof/profile.conf ]] || return 1
|
||||
|
||||
[[ -f "$profdir/Packages-Desktop" ]] && desktop_list="$profdir/Packages-Desktop"
|
||||
[[ -d "$profdir/desktop-overlay" ]] && desktop_overlay="$profdir/desktop-overlay"
|
||||
|
||||
live_list="${DATADIR}/iso-profiles/base/Packages-Live"
|
||||
[[ -f "$profdir/Packages-Live" ]] && live_list="$profdir/Packages-Live"
|
||||
|
||||
live_overlay="${DATADIR}/iso-profiles/base/live-overlay"
|
||||
[[ -d "$profdir/live-overlay" ]] && live_overlay="$profdir/live-overlay"
|
||||
|
||||
[[ -f $profdir/profile.conf ]] || return 1
|
||||
|
||||
[[ -r $profdir/profile.conf ]] && source $profdir/profile.conf
|
||||
[[ -r $profdir/$prof/profile.conf ]] && source $profdir/$prof/profile.conf
|
||||
|
||||
[[ -z ${displaymanager} ]] && displaymanager="none"
|
||||
|
||||
@@ -44,11 +49,11 @@ load_profile(){
|
||||
[[ -z ${password} ]] && password="artix"
|
||||
|
||||
if [[ -z ${addgroups} ]];then
|
||||
addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio,log"
|
||||
addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
|
||||
fi
|
||||
|
||||
if [[ -z ${services[@]} ]];then
|
||||
services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
|
||||
services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
|
||||
fi
|
||||
|
||||
if [[ ${displaymanager} != "none" ]];then
|
||||
|
@@ -35,7 +35,7 @@ patch_pkg(){
|
||||
-e '/nscd.service/d' \
|
||||
-i $pkg/trunk/PKGBUILD
|
||||
;;
|
||||
'tp_smapi'|'acpi_call'|'r8168'|'bbswitch')
|
||||
'tp_smapi'|'acpi_call'|'r8168'|'bbswitch'|'broadcom-wl')
|
||||
sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
|
||||
;;
|
||||
'nvidia')
|
||||
|
Reference in New Issue
Block a user