Compare commits
185 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
16fd97e2d3 | ||
![]() |
25808c8034 | ||
![]() |
d87aade54b | ||
![]() |
37aa3c1c65 | ||
![]() |
c870472267 | ||
![]() |
563e2bbc4a | ||
![]() |
6463779536 | ||
![]() |
8b98c6cac9 | ||
![]() |
a47c8e1a44 | ||
![]() |
c7cf6c05a0 | ||
![]() |
5c4406a19a | ||
![]() |
5a1105302a | ||
![]() |
6a376c8b65 | ||
![]() |
bfbbd12316 | ||
![]() |
c51d75acf0 | ||
![]() |
11ea38fe32 | ||
![]() |
55b9b69859 | ||
![]() |
d2ae040e45 | ||
![]() |
691c401251 | ||
![]() |
8861b9c8f8 | ||
![]() |
c74dda6e53 | ||
![]() |
da54be8ea2 | ||
![]() |
6551d66a99 | ||
![]() |
8ed2464c5f | ||
![]() |
f2006adfaa | ||
![]() |
fe3bd6296f | ||
![]() |
4ac466a83e | ||
![]() |
c76a29eaf7 | ||
![]() |
4b7ff99b98 | ||
![]() |
e034e965d3 | ||
![]() |
e4bb309841 | ||
![]() |
7d207257f7 | ||
![]() |
ec10df53b8 | ||
![]() |
d32d254632 | ||
![]() |
793721249a | ||
![]() |
acd9ee7e28 | ||
![]() |
c9337155e1 | ||
![]() |
8f1da6d4fb | ||
![]() |
1ab0e41426 | ||
![]() |
6f01896066 | ||
![]() |
cba60d97c6 | ||
![]() |
4ba2a309c0 | ||
![]() |
6193ad59b2 | ||
![]() |
b2c1c3288b | ||
![]() |
84242b79d0 | ||
![]() |
6039f88715 | ||
![]() |
54cb15f3a2 | ||
![]() |
13f63047a2 | ||
![]() |
7cc0c0c86a | ||
![]() |
327be3b735 | ||
![]() |
6e20fc6d07 | ||
![]() |
8436f0cafb | ||
![]() |
1ded762a78 | ||
![]() |
f3ac8b8679 | ||
![]() |
622f426686 | ||
![]() |
07ee48ff72 | ||
![]() |
1728682147 | ||
![]() |
710d615cbb | ||
![]() |
a305eac6ce | ||
![]() |
b964b729cc | ||
![]() |
6d5b4d45dd | ||
![]() |
a98a7b5100 | ||
![]() |
3c80f711da | ||
![]() |
501272464b | ||
![]() |
c6ddda2773 | ||
![]() |
2bed948636 | ||
![]() |
98c1d950f8 | ||
![]() |
6941b3ce3b | ||
![]() |
1972ee936e | ||
![]() |
01e45fd5fd | ||
![]() |
a795484c7b | ||
![]() |
e099003b31 | ||
![]() |
dbec8ba9ad | ||
![]() |
b35754ecce | ||
![]() |
91cdece50d | ||
![]() |
cbce0239ec | ||
![]() |
f6a0e565af | ||
![]() |
cfd03d199f | ||
![]() |
3cf71e6e08 | ||
![]() |
276b5de46f | ||
![]() |
587512add9 | ||
![]() |
0eedc88f2f | ||
![]() |
2b08fb55ee | ||
![]() |
b0b95c359d | ||
![]() |
fdeb9f8a54 | ||
![]() |
e365743567 | ||
![]() |
7acf81b2c8 | ||
![]() |
ca15981350 | ||
![]() |
188f50e968 | ||
![]() |
77e20fd5c0 | ||
![]() |
260e9fb4c5 | ||
![]() |
e597de9377 | ||
![]() |
a1745b28b1 | ||
![]() |
d2e6872b78 | ||
![]() |
2cac649a0f | ||
![]() |
80b84c3fdb | ||
![]() |
762ab73d6e | ||
![]() |
51c613b203 | ||
![]() |
a4ee7b3dc6 | ||
![]() |
3f0c2d74f8 | ||
![]() |
e27349a1d9 | ||
![]() |
c981ab4a83 | ||
![]() |
d49b0dedc5 | ||
![]() |
4f8861d158 | ||
![]() |
e164b60208 | ||
![]() |
a84b4884f5 | ||
7bb8801f31
|
|||
9a83ca420f
|
|||
![]() |
1995bb87d6 | ||
![]() |
7a6f8946d5 | ||
![]() |
c31fcbafd5 | ||
![]() |
7ff31cbaa0 | ||
![]() |
8696c8f986 | ||
![]() |
9c55510610 | ||
![]() |
8742397f69 | ||
![]() |
6334b60956 | ||
![]() |
69511b6ce9 | ||
![]() |
bf814c03fe | ||
![]() |
f6f2776a34 | ||
![]() |
21951149b9 | ||
![]() |
902a3913c8 | ||
![]() |
1dc4255ef4 | ||
![]() |
7e45b8020a | ||
![]() |
28c9f9d708 | ||
![]() |
dc791a8ff5 | ||
![]() |
fd75e887c2 | ||
![]() |
59b6cc1314 | ||
![]() |
4438210168 | ||
![]() |
20474cc5ca | ||
![]() |
422f8f0253 | ||
![]() |
9a2be670bc | ||
![]() |
7ff5e93bfe | ||
![]() |
98854cf650 | ||
![]() |
0e7350e39d | ||
![]() |
09e05ef59b | ||
![]() |
127165d33e | ||
![]() |
6f154bb828 | ||
![]() |
488a385c03 | ||
![]() |
c7696e61fc | ||
![]() |
cbe3d19a30 | ||
![]() |
0f90ef836a | ||
![]() |
594ee6716a | ||
![]() |
365762a494 | ||
![]() |
fdb3361041 | ||
![]() |
f56031547f | ||
![]() |
d2cf21e71e | ||
![]() |
bcdeb2f337 | ||
![]() |
f81423405d | ||
![]() |
1ffb06e810 | ||
![]() |
f07da7433a | ||
![]() |
d2957e9d11 | ||
![]() |
83c385c12e | ||
![]() |
e9218093d0 | ||
![]() |
eee80c1478 | ||
![]() |
0bad32939c | ||
![]() |
59bb576963 | ||
![]() |
a90c850b1b | ||
![]() |
d060b051c7 | ||
![]() |
f3a4d4c56f | ||
![]() |
d3e0d1cff8 | ||
![]() |
23ee0537a3 | ||
![]() |
5ebc08a875 | ||
![]() |
64f9263da8 | ||
![]() |
4a6c2bd4c9 | ||
![]() |
8b8ce8674b | ||
![]() |
e42ce00169 | ||
![]() |
cb239e152a | ||
![]() |
6a0edc7e2c | ||
![]() |
49e6225dc4 | ||
![]() |
61310dc54f | ||
![]() |
dff1495ac2 | ||
![]() |
ad7b1e4ce5 | ||
![]() |
b05e9419ee | ||
![]() |
d1b8a65e80 | ||
![]() |
b53369b49c | ||
![]() |
79c380b4ce | ||
![]() |
5b2436ccc3 | ||
![]() |
200dbae331 | ||
![]() |
01142309ac | ||
![]() |
d630ed2582 | ||
![]() |
9c546ca7fb | ||
![]() |
a6a74c69f1 | ||
![]() |
0f51544da4 | ||
![]() |
afe30328a6 | ||
![]() |
9d7148b60e |
72
Makefile
72
Makefile
@@ -1,4 +1,4 @@
|
|||||||
Version=0.5
|
Version=0.6
|
||||||
|
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
SYSCONFDIR = /etc
|
SYSCONFDIR = /etc
|
||||||
@@ -22,14 +22,7 @@ LIBS_BASE = \
|
|||||||
lib/util-fstab.sh
|
lib/util-fstab.sh
|
||||||
|
|
||||||
SHARED_BASE = \
|
SHARED_BASE = \
|
||||||
data/pacman-default.conf \
|
$(wildcard data/pacman*.conf)
|
||||||
data/pacman-multilib.conf
|
|
||||||
|
|
||||||
LIST_PKG = \
|
|
||||||
$(wildcard data/pkg.list.d/*.list)
|
|
||||||
|
|
||||||
ARCH_CONF = \
|
|
||||||
$(wildcard data/make.conf.d/*.conf)
|
|
||||||
|
|
||||||
LIST_IMPORT = \
|
LIST_IMPORT = \
|
||||||
$(wildcard data/import.list.d/*.list)
|
$(wildcard data/import.list.d/*.list)
|
||||||
@@ -38,8 +31,8 @@ BIN_PKG = \
|
|||||||
bin/checkpkg \
|
bin/checkpkg \
|
||||||
bin/lddd \
|
bin/lddd \
|
||||||
bin/finddeps \
|
bin/finddeps \
|
||||||
|
bin/findupdates \
|
||||||
bin/find-libdeps \
|
bin/find-libdeps \
|
||||||
bin/signpkgs \
|
|
||||||
bin/mkchrootpkg \
|
bin/mkchrootpkg \
|
||||||
bin/buildpkg \
|
bin/buildpkg \
|
||||||
bin/buildtree \
|
bin/buildtree \
|
||||||
@@ -51,6 +44,9 @@ LIBS_PKG = \
|
|||||||
SHARED_PKG = \
|
SHARED_PKG = \
|
||||||
data/makepkg.conf
|
data/makepkg.conf
|
||||||
|
|
||||||
|
PATCHES = \
|
||||||
|
$(wildcard data/patches/*.patch)
|
||||||
|
|
||||||
BIN_ISO = \
|
BIN_ISO = \
|
||||||
bin/buildiso \
|
bin/buildiso \
|
||||||
bin/deployiso
|
bin/deployiso
|
||||||
@@ -59,8 +55,7 @@ LIBS_ISO = \
|
|||||||
$(wildcard lib/util-iso*.sh)
|
$(wildcard lib/util-iso*.sh)
|
||||||
|
|
||||||
SHARED_ISO = \
|
SHARED_ISO = \
|
||||||
data/mkinitcpio.conf \
|
data/mkinitcpio.conf
|
||||||
data/profile.conf.example
|
|
||||||
|
|
||||||
CPIOHOOKS = \
|
CPIOHOOKS = \
|
||||||
$(wildcard initcpio/hooks/*)
|
$(wildcard initcpio/hooks/*)
|
||||||
@@ -71,19 +66,6 @@ CPIOINST = \
|
|||||||
CPIO = \
|
CPIO = \
|
||||||
initcpio/script/artix_shutdown
|
initcpio/script/artix_shutdown
|
||||||
|
|
||||||
BIN_YAML = \
|
|
||||||
bin/buildyaml
|
|
||||||
|
|
||||||
LIBS_YAML = \
|
|
||||||
$(wildcard lib/util-yaml*.sh) \
|
|
||||||
lib/util-profile.sh
|
|
||||||
|
|
||||||
SHARED_YAML = \
|
|
||||||
data/linux.preset
|
|
||||||
|
|
||||||
INFO = \
|
|
||||||
data/repo_info
|
|
||||||
|
|
||||||
BASE = \
|
BASE = \
|
||||||
$(wildcard data/base/Packages-*) \
|
$(wildcard data/base/Packages-*) \
|
||||||
data/base/profile.conf
|
data/base/profile.conf
|
||||||
@@ -101,7 +83,7 @@ LIVE_ETC_PAM = \
|
|||||||
LIVE_ETC_SUDOERS = \
|
LIVE_ETC_SUDOERS = \
|
||||||
$(wildcard data/base/live-overlay/etc/sudoers.d/*)
|
$(wildcard data/base/live-overlay/etc/sudoers.d/*)
|
||||||
|
|
||||||
all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO) $(BIN_YAML)
|
all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
|
||||||
|
|
||||||
edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
|
edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
|
||||||
-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/artools|g" \
|
-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/artools|g" \
|
||||||
@@ -135,12 +117,11 @@ install_pkg:
|
|||||||
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
|
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
|
||||||
install -m0644 ${LIST_IMPORT} $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
|
install -m0644 ${LIST_IMPORT} $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d
|
|
||||||
install -m0644 ${ARCH_CONF} $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
||||||
install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
|
install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
|
||||||
|
|
||||||
|
ln -sf buildpkg $(DESTDIR)$(PREFIX)/bin/buildpkg-testing
|
||||||
|
|
||||||
ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
|
ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
|
install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
|
||||||
@@ -149,10 +130,10 @@ install_pkg:
|
|||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
|
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
|
||||||
install -m0644 ${SHARED_PKG} $(DESTDIR)$(PREFIX)/share/artools
|
install -m0644 ${SHARED_PKG} $(DESTDIR)$(PREFIX)/share/artools
|
||||||
|
|
||||||
install_isobase:
|
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/patches
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
|
install -m0644 ${PATCHES} $(DESTDIR)$(PREFIX)/share/artools/patches
|
||||||
install -m0644 ${INFO} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
|
|
||||||
|
|
||||||
|
install_isobase:
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
|
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
|
||||||
install -m0644 ${BASE} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
|
install -m0644 ${BASE} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
|
||||||
|
|
||||||
@@ -172,6 +153,8 @@ install_iso:
|
|||||||
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
||||||
install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
|
install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
|
||||||
|
|
||||||
|
ln -sf buildiso $(DESTDIR)$(PREFIX)/bin/buildiso-testing
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
|
install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
|
||||||
install -m0644 ${LIBS_ISO} $(DESTDIR)$(PREFIX)/lib/artools
|
install -m0644 ${LIBS_ISO} $(DESTDIR)$(PREFIX)/lib/artools
|
||||||
|
|
||||||
@@ -183,20 +166,9 @@ install_iso:
|
|||||||
|
|
||||||
install -m0755 ${CPIO} $(DESTDIR)$(SYSCONFDIR)/initcpio
|
install -m0755 ${CPIO} $(DESTDIR)$(SYSCONFDIR)/initcpio
|
||||||
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
|
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
|
||||||
install -m0644 ${SHARED_ISO} $(DESTDIR)$(PREFIX)/share/artools
|
install -m0644 ${SHARED_ISO} $(DESTDIR)$(PREFIX)/share/artools
|
||||||
|
|
||||||
install_yaml:
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
|
||||||
install -m0755 ${BIN_YAML} $(DESTDIR)$(PREFIX)/bin
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
|
|
||||||
install -m0644 ${LIBS_YAML} $(DESTDIR)$(PREFIX)/lib/artools
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
|
|
||||||
install -m0644 ${SHARED_YAML} $(DESTDIR)$(PREFIX)/share/artools
|
|
||||||
|
|
||||||
uninstall_base:
|
uninstall_base:
|
||||||
for f in ${SYSCONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/$$f; done
|
for f in ${SYSCONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/$$f; done
|
||||||
for f in ${BIN_BASE}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
for f in ${BIN_BASE}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
||||||
@@ -205,14 +177,14 @@ uninstall_base:
|
|||||||
|
|
||||||
uninstall_pkg:
|
uninstall_pkg:
|
||||||
for f in ${LIST_IMPORT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d/$$f; done
|
for f in ${LIST_IMPORT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d/$$f; done
|
||||||
for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d/$$f; done
|
|
||||||
for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
|
rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
|
||||||
|
rm -f $(DESTDIR)$(PREFIX)/bin/buildpkg-testing
|
||||||
for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
|
for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
|
||||||
|
for f in ${PATCHES}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/patches/$$f; done
|
||||||
for f in ${LIBS_PKG}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
|
for f in ${LIBS_PKG}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
|
||||||
|
|
||||||
uninstall_isobase:
|
uninstall_isobase:
|
||||||
for f in ${INFO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/$$f; done
|
|
||||||
for f in ${BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/$$f; done
|
for f in ${BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/$$f; done
|
||||||
for f in ${LIVE_ETC}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/$$f; done
|
for f in ${LIVE_ETC}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/$$f; done
|
||||||
for f in ${LIVE_ETC_DEFAULT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default/$$f; done
|
for f in ${LIVE_ETC_DEFAULT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default/$$f; done
|
||||||
@@ -221,6 +193,7 @@ uninstall_isobase:
|
|||||||
|
|
||||||
uninstall_iso:
|
uninstall_iso:
|
||||||
for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
||||||
|
rm -f $(DESTDIR)$(PREFIX)/bin/buildiso-testing
|
||||||
for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
|
for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
|
||||||
|
|
||||||
for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
|
for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
|
||||||
@@ -228,14 +201,9 @@ uninstall_iso:
|
|||||||
for f in ${CPIOINST}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/install/$$f; done
|
for f in ${CPIOINST}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/install/$$f; done
|
||||||
for f in ${CPIO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/$$f; done
|
for f in ${CPIO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/$$f; done
|
||||||
|
|
||||||
uninstall_yaml:
|
install: install_base install_pkg install_iso install_isobase
|
||||||
for f in ${BIN_YAML}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
|
||||||
for f in ${LIBS_YAML}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
|
|
||||||
for f in ${SHARED_YAML}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
|
|
||||||
|
|
||||||
install: install_base install_pkg install_iso install_yaml install_isobase
|
uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_isobase
|
||||||
|
|
||||||
uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_yaml uninstall_isobase
|
|
||||||
|
|
||||||
dist:
|
dist:
|
||||||
git archive --format=tar --prefix=artools-$(Version)/ $(Version) | gzip -9 > artools-$(Version).tar.gz
|
git archive --format=tar --prefix=artools-$(Version)/ $(Version) | gzip -9 > artools-$(Version).tar.gz
|
||||||
|
@@ -25,6 +25,8 @@ newroot=/mnt
|
|||||||
hostcache=false
|
hostcache=false
|
||||||
copykeyring=true
|
copykeyring=true
|
||||||
copymirrorlist=true
|
copymirrorlist=true
|
||||||
|
directory=false
|
||||||
|
interactive=false
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "usage: ${0##*/} [options] root [packages...]"
|
echo "usage: ${0##*/} [options] root [packages...]"
|
||||||
@@ -67,9 +69,9 @@ check_root
|
|||||||
newroot=$1; shift
|
newroot=$1; shift
|
||||||
pacman_args=("${@:-base}")
|
pacman_args=("${@:-base}")
|
||||||
|
|
||||||
${hostcache} && pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
|
${hostcache} || pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
|
||||||
|
|
||||||
${interactive} && pacman_args+=(--noconfirm)
|
${interactive} || pacman_args+=(--noconfirm)
|
||||||
|
|
||||||
[[ -n $pacman_conf ]] && pacman_args+=(--config="$pacman_conf")
|
[[ -n $pacman_conf ]] && pacman_args+=(--config="$pacman_conf")
|
||||||
|
|
||||||
|
@@ -19,13 +19,41 @@ SYSCONFDIR='@sysconfdir@'
|
|||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
import ${LIBDIR}/util-iso.sh
|
import ${LIBDIR}/util-iso.sh
|
||||||
|
|
||||||
|
prepare_build(){
|
||||||
|
timer_start=$(get_timer)
|
||||||
|
|
||||||
|
load_profile "${profile}"
|
||||||
|
|
||||||
|
netgroups=${netgroups_url}/netgroups-${initsys}.yaml
|
||||||
|
|
||||||
|
local pacman_conf pac_file="pacman.conf"
|
||||||
|
|
||||||
|
case "${stablility}" in
|
||||||
|
'testing') pac_file="pacman-${stablility}.conf" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
pacman_conf="${DATADIR}/$pac_file"
|
||||||
|
[[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
|
||||||
|
|
||||||
|
iso_file=$(gen_iso_fn).iso
|
||||||
|
|
||||||
|
mkchroot_args+=(-C ${pacman_conf})
|
||||||
|
work_dir=${chroots_iso}/${profile}/${target_arch}
|
||||||
|
|
||||||
|
iso_dir="${iso_pool}/${profile}"
|
||||||
|
|
||||||
|
iso_root=${chroots_iso}/${profile}/iso
|
||||||
|
mnt_dir=${chroots_iso}/${profile}/mnt
|
||||||
|
prepare_dir "${mnt_dir}"
|
||||||
|
prepare_dir "${iso_dir}"
|
||||||
|
}
|
||||||
|
|
||||||
show_profile(){
|
show_profile(){
|
||||||
prepare_build
|
|
||||||
msg2 "iso_file: %s" "${iso_file}"
|
msg2 "iso_file: %s" "${iso_file}"
|
||||||
if ${verbose};then
|
if ${verbose};then
|
||||||
msg2 "autologin: %s" "${autologin}"
|
msg2 "autologin: %s" "${autologin}"
|
||||||
|
|
||||||
msg2 "netgroups: %s" "$(get_yaml)"
|
msg2 "netgroups: %s" "${netgroups}"
|
||||||
|
|
||||||
msg2 "hostname: %s" "${hostname}"
|
msg2 "hostname: %s" "${hostname}"
|
||||||
msg2 "username: %s" "${username}"
|
msg2 "username: %s" "${username}"
|
||||||
@@ -36,7 +64,6 @@ show_profile(){
|
|||||||
msg2 "openrc_boot: %s" "${openrc_boot[*]}"
|
msg2 "openrc_boot: %s" "${openrc_boot[*]}"
|
||||||
msg2 "openrc_default: %s" "${openrc_default[*]}"
|
msg2 "openrc_default: %s" "${openrc_default[*]}"
|
||||||
fi
|
fi
|
||||||
reset_profile
|
|
||||||
}
|
}
|
||||||
|
|
||||||
display_settings(){
|
display_settings(){
|
||||||
@@ -45,10 +72,10 @@ display_settings(){
|
|||||||
|
|
||||||
msg "OPTIONS:"
|
msg "OPTIONS:"
|
||||||
msg2 "profile: %s" "${profile}"
|
msg2 "profile: %s" "${profile}"
|
||||||
msg2 "arch: %s" "${target_arch}"
|
|
||||||
msg2 "initsys: %s" "${initsys}"
|
msg2 "initsys: %s" "${initsys}"
|
||||||
msg2 "kernel: %s" "${kernel}"
|
msg2 "kernel: %s" "${kernel}"
|
||||||
[[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
|
[[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
|
||||||
|
msg2 "stablility: %s" "${stablility}"
|
||||||
|
|
||||||
msg "ARGS:"
|
msg "ARGS:"
|
||||||
msg2 "clean_first: %s" "${clean_first}"
|
msg2 "clean_first: %s" "${clean_first}"
|
||||||
@@ -56,21 +83,52 @@ display_settings(){
|
|||||||
msg2 "iso_only: %s" "${iso_only}"
|
msg2 "iso_only: %s" "${iso_only}"
|
||||||
msg2 "persist: %s" "${persist}"
|
msg2 "persist: %s" "${persist}"
|
||||||
|
|
||||||
msg "DIST SETTINGS:"
|
msg "ISO SETTINGS:"
|
||||||
msg2 "dist_name: %s" "${dist_name}"
|
msg2 "iso_version: %s" "${iso_version}"
|
||||||
msg2 "dist_release: %s" "${dist_release}"
|
|
||||||
msg2 "dist_branding: %s" "${dist_branding}"
|
|
||||||
|
|
||||||
msg "BUILD:"
|
msg "BUILD:"
|
||||||
show_profile
|
show_profile
|
||||||
}
|
}
|
||||||
|
|
||||||
|
build(){
|
||||||
|
msg "Start building [%s]" "${profile}"
|
||||||
|
if ${clean_first};then
|
||||||
|
for copy in "${work_dir}"/*; do
|
||||||
|
[[ -d $copy ]] || continue
|
||||||
|
msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
|
||||||
|
|
||||||
|
lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
|
||||||
|
|
||||||
|
subvolume_delete_recursive "${copy}"
|
||||||
|
rm -rf --one-file-system "${copy}"
|
||||||
|
done
|
||||||
|
lock_close 9
|
||||||
|
|
||||||
|
rm -rf --one-file-system "${work_dir}"
|
||||||
|
clean_iso_root "${iso_root}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ${iso_only}; then
|
||||||
|
[[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
|
||||||
|
compress_images
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ${images_only}; then
|
||||||
|
prepare_images
|
||||||
|
warning "Continue compress: buildiso -p %s -zc ..." "${profile}"
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
prepare_images
|
||||||
|
compress_images
|
||||||
|
fi
|
||||||
|
msg "Finished building [%s]" "${profile}"
|
||||||
|
show_elapsed_time "${FUNCNAME}" "${timer_start}"
|
||||||
|
}
|
||||||
|
|
||||||
load_user_info
|
load_user_info
|
||||||
|
|
||||||
load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
|
load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
|
||||||
|
|
||||||
load_run_dir
|
|
||||||
|
|
||||||
clean_first=true
|
clean_first=true
|
||||||
pretend=false
|
pretend=false
|
||||||
images_only=false
|
images_only=false
|
||||||
@@ -79,15 +137,16 @@ verbose=false
|
|||||||
persist=false
|
persist=false
|
||||||
|
|
||||||
mkchroot_args=()
|
mkchroot_args=()
|
||||||
|
cmd=${0##*/}
|
||||||
|
stablility=${cmd##*-}
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options]"
|
echo "Usage: ${0##*/} [options]"
|
||||||
echo " -p <profile> Profile [default: ${profile}]"
|
echo " -p <profile> Profile [default: ${profile}]"
|
||||||
echo " -a <arch> Arch [default: ${target_arch}]"
|
|
||||||
echo ' -r <dir> Chroots directory'
|
echo ' -r <dir> Chroots directory'
|
||||||
echo " [default: ${chroots_iso}]"
|
echo " [default: ${chroots_iso}]"
|
||||||
echo ' -t <dir> Target directory'
|
echo ' -t <dir> Target directory'
|
||||||
echo " [default: ${cache_dir_iso}]"
|
echo " [default: ${iso_pool}]"
|
||||||
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 ' -i <name> Init system to use'
|
||||||
@@ -109,14 +168,13 @@ usage() {
|
|||||||
|
|
||||||
orig_argv=("$0" "$@")
|
orig_argv=("$0" "$@")
|
||||||
|
|
||||||
opts='p:a:r:t:k:i:g:czxmvqh'
|
opts='p:r:t:k:i:g:czxmvqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
p) profile="$OPTARG" ;;
|
p) profile="$OPTARG" ;;
|
||||||
a) target_arch="$OPTARG" ;;
|
|
||||||
r) chroots_iso="$OPTARG" ;;
|
r) chroots_iso="$OPTARG" ;;
|
||||||
t) cache_dir_iso="$OPTARG" ;;
|
t) iso_pool="$OPTARG" ;;
|
||||||
k) kernel="$OPTARG" ;;
|
k) kernel="$OPTARG" ;;
|
||||||
i) initsys="$OPTARG" ;;
|
i) initsys="$OPTARG" ;;
|
||||||
g) gpgkey="$OPTARG" ;;
|
g) gpgkey="$OPTARG" ;;
|
||||||
@@ -135,7 +193,9 @@ shift $(($OPTIND - 1))
|
|||||||
|
|
||||||
check_root
|
check_root
|
||||||
|
|
||||||
check_requirements
|
prepare_traps
|
||||||
|
|
||||||
|
prepare_build
|
||||||
|
|
||||||
${pretend} && display_settings && exit 1
|
${pretend} && display_settings && exit 1
|
||||||
|
|
||||||
|
149
bin/buildpkg.in
149
bin/buildpkg.in
@@ -21,10 +21,8 @@ SYSCONFDIR='@sysconfdir@'
|
|||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
import ${LIBDIR}/util-chroot.sh
|
import ${LIBDIR}/util-chroot.sh
|
||||||
import ${LIBDIR}/util-pkg.sh
|
import ${LIBDIR}/util-pkg.sh
|
||||||
import ${LIBDIR}/util-pkg-chroot.sh
|
|
||||||
|
|
||||||
show_pkg(){
|
show_pkg(){
|
||||||
check_build "$1"
|
|
||||||
cd $1
|
cd $1
|
||||||
source PKGBUILD
|
source PKGBUILD
|
||||||
for n in ${pkgname[@]}; do
|
for n in ${pkgname[@]}; do
|
||||||
@@ -38,27 +36,14 @@ display_settings(){
|
|||||||
show_config
|
show_config
|
||||||
|
|
||||||
msg "OPTIONS:"
|
msg "OPTIONS:"
|
||||||
msg2 "arch: %s" "${target_arch}"
|
|
||||||
msg2 "repository: %s" "${repository}"
|
|
||||||
msg2 "chroots_pkg: %s" "${chroots_pkg}"
|
msg2 "chroots_pkg: %s" "${chroots_pkg}"
|
||||||
|
msg2 "repository: %s" "${repository}"
|
||||||
|
msg2 "stablility: %s" "${stablility}"
|
||||||
|
|
||||||
msg "ARGS:"
|
msg "ARGS:"
|
||||||
msg2 "create_first: %s" "${create_first}"
|
msg2 "create_first: %s" "${create_first}"
|
||||||
msg2 "delete_first: %s" "${delete_first}"
|
msg2 "makepkg_args: %s" "${makepkg_args[*]}"
|
||||||
msg2 "clean_first: %s" "${clean_first}"
|
msg2 "mkchrootpkg_args: %s" "${mkchrootpkg_args[*]}"
|
||||||
msg2 "update_first: %s" "${update_first}"
|
|
||||||
msg2 "namcap: %s" "${namcap}"
|
|
||||||
msg2 "sign: %s" "${sign}"
|
|
||||||
msg2 "repo_add: %s" "${repo_add}"
|
|
||||||
msg2 "copy_pkg: %s" "${copy_pkg}"
|
|
||||||
|
|
||||||
msg "PATHS:"
|
|
||||||
msg2 "pkg_dir: %s" "${pkg_dir}"
|
|
||||||
|
|
||||||
if ${create_first};then
|
|
||||||
msg "PKG:"
|
|
||||||
msg2 "packages: %s" "${packages[*]}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
msg "BUILD:"
|
msg "BUILD:"
|
||||||
show_pkg "${package}"
|
show_pkg "${package}"
|
||||||
@@ -67,110 +52,92 @@ display_settings(){
|
|||||||
load_user_info
|
load_user_info
|
||||||
|
|
||||||
load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
|
load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
|
||||||
load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
|
||||||
load_vars /etc/makepkg.conf
|
|
||||||
|
|
||||||
create_first=false
|
create_first=false
|
||||||
delete_first=false
|
|
||||||
clean_first=false
|
|
||||||
update_first=false
|
|
||||||
namcap=false
|
|
||||||
pretend=false
|
pretend=false
|
||||||
sign=false
|
lib32=false
|
||||||
is_multilib=false
|
|
||||||
repo_add=false
|
|
||||||
copy_pkg=false
|
|
||||||
|
|
||||||
mkchroot_args=()
|
mkchroot_args=()
|
||||||
mkchrootpkg_args=()
|
mkchrootpkg_args=(-c -n)
|
||||||
deploypkg_args=(-x)
|
|
||||||
|
|
||||||
install_pkgs=()
|
install_pkgs=()
|
||||||
repository=${PWD##*/}
|
|
||||||
package=''
|
package=''
|
||||||
|
cmd=${0##*/}
|
||||||
|
stablility=${cmd##*-}
|
||||||
|
repository=${PWD##*/}
|
||||||
|
base_devel=('base-devel')
|
||||||
|
|
||||||
prepare_build(){
|
prepare_build(){
|
||||||
local pac_arch='default'
|
local pac_file='pacman.conf' mp_file='makepkg.conf'
|
||||||
|
|
||||||
if [[ "${target_arch}" == 'multilib' ]];then
|
case "${stablility}" in
|
||||||
pac_arch='multilib'
|
'testing') pac_file="pacman-${stablility}.conf" ;;
|
||||||
is_multilib=true
|
esac
|
||||||
fi
|
|
||||||
|
|
||||||
local pacman_conf="${DATADIR}/pacman-$pac_arch.conf"
|
${lib32} && base_devel+=('multilib-devel')
|
||||||
[[ -f $AT_USERCONFDIR/pacman-$pac_arch.conf ]] && pacman_conf="$AT_USERCONFDIR/pacman-$pac_arch.conf"
|
|
||||||
|
|
||||||
work_dir="${chroots_pkg}/${target_arch}/${repository}"
|
local pacman_conf="${DATADIR}/$pac_file"
|
||||||
pkg_dir="${cache_dir_pkg}/${target_arch}/${repository}"
|
[[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
|
||||||
|
|
||||||
local makepkg_conf=$(get_makepkg_conf "${target_arch}")
|
work_dir="${chroots_pkg}/${repository}-${target_arch}"
|
||||||
|
|
||||||
[[ "$pac_arch" == 'multilib' ]] && target_arch='x86_64'
|
local makepkg_conf="${DATADIR}/$mp_file"
|
||||||
|
[[ -f $AT_USERCONFDIR/$mp_file ]] && makepkg_conf="$AT_USERCONFDIR/$mp_file"
|
||||||
|
|
||||||
mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf})
|
mkchroot_args+=(-C "${pacman_conf}" -M "${makepkg_conf}" "${work_dir}/root")
|
||||||
|
|
||||||
mkchrootpkg_args+=(-r ${work_dir})
|
mkchrootpkg_args+=(-r "${work_dir}" "${makepkg_args[@]}")
|
||||||
deploypkg_args+=(-r ${repository})
|
|
||||||
|
|
||||||
prepare_dir "${pkg_dir}"
|
|
||||||
|
|
||||||
prepare_dir "${work_dir}"
|
|
||||||
|
|
||||||
packages=('base-devel')
|
|
||||||
${is_multilib} && packages+=('multilib-devel')
|
|
||||||
|
|
||||||
timer_start=$(get_timer)
|
timer_start=$(get_timer)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
build(){
|
||||||
|
local timer_start=$(get_timer)
|
||||||
|
if [[ -f ${package}/PKGBUILD ]];then
|
||||||
|
cd ${package}
|
||||||
|
else
|
||||||
|
die "Directory must contain a PKGBUILD!"
|
||||||
|
fi
|
||||||
|
msg "Start building [%s] (%s)" "${package}" "${repository}"
|
||||||
|
exec mkchrootpkg "${mkchrootpkg_args[@]}"
|
||||||
|
show_elapsed_time "${FUNCNAME}" "${timer_start}"
|
||||||
|
}
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options]"
|
echo "Usage: ${0##*/} [options] -- [makepkg_args]"
|
||||||
echo " -p <pkg> Package to build [default: ${package}]"
|
echo " -p <pkg> Package to build [default: ${package}]"
|
||||||
echo " -a <arch> Arch [default: ${target_arch}]"
|
echo " -r <dir> Chroots directory [default: ${chroots_pkg}]"
|
||||||
echo ' -r <dir> Chroots directory'
|
echo ' -z <repo> Repo name'
|
||||||
echo " [default: ${chroots_pkg}]"
|
echo ' -c Create root chroot'
|
||||||
echo ' -i <pkgs> Install packages into the working copy of the chroot'
|
echo ' -m Multilib chroot'
|
||||||
echo " -z <repo> The repo name to add the package(s) [default: ${repository}]"
|
|
||||||
echo ' -o Create chroot'
|
|
||||||
echo ' -d Delete chroot'
|
|
||||||
echo ' -c Clean chroot copy'
|
|
||||||
echo ' -u Update chroot copy'
|
|
||||||
echo ' -x Add the package(s) to the repo'
|
|
||||||
echo ' -l Copy the package(s) to the repo instead of symlink'
|
|
||||||
echo ' -n Install and run namcap check'
|
|
||||||
echo ' -s Sign packages'
|
|
||||||
echo ' -q Query settings and pretend build'
|
echo ' -q Query settings and pretend build'
|
||||||
echo ' -h This help'
|
echo ' -h This help'
|
||||||
echo ''
|
echo ''
|
||||||
|
echo "Default makepkg_args args: ${makepkg_args[*]}"
|
||||||
echo ''
|
echo ''
|
||||||
exit $1
|
exit $1
|
||||||
}
|
}
|
||||||
|
|
||||||
orig_argv=("$0" "$@")
|
orig_argv=("$0" "$@")
|
||||||
|
|
||||||
opts='p:a:r:i:z:oldcunsxqh'
|
opts='p:r:z:cmqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
p) package="$OPTARG" ;;
|
p) package="$OPTARG" ;;
|
||||||
a) target_arch="$OPTARG" ;;
|
|
||||||
r) chroots_pkg="$OPTARG" ;;
|
r) chroots_pkg="$OPTARG" ;;
|
||||||
i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I "${install_pkgs[*]}") ;;
|
|
||||||
z) repository="$OPTARG" ;;
|
z) repository="$OPTARG" ;;
|
||||||
o) create_first=true ;;
|
c) create_first=true ;;
|
||||||
d) delete_first=true ;;
|
m) lib32=true ;;
|
||||||
c) clean_first=true ; mkchrootpkg_args+=(-c) ;;
|
|
||||||
u) update_first=true ; mkchrootpkg_args+=(-u) ;;
|
|
||||||
x) repo_add=true ;;
|
|
||||||
l) copy_pkg=true; deploypkg_args+=(-c) ;;
|
|
||||||
n) namcap=true; mkchrootpkg_args+=(-n) ;;
|
|
||||||
s) sign=true ;;
|
|
||||||
q) pretend=true ;;
|
q) pretend=true ;;
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
*) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
|
*) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
shift $(($OPTIND - 1))
|
# shift $(($OPTIND - 1))
|
||||||
|
makepkg_args+=("${@:$OPTIND}")
|
||||||
|
|
||||||
check_root
|
check_root
|
||||||
|
|
||||||
@@ -178,8 +145,28 @@ prepare_build
|
|||||||
|
|
||||||
${pretend} && display_settings && exit
|
${pretend} && display_settings && exit
|
||||||
|
|
||||||
${delete_first} && delete_chroot "${work_dir}/root" "${work_dir}"
|
if ${create_first} || [[ ! -d ${work_dir}/root ]];then
|
||||||
|
msg "Creating chroot for [%s] (%s)..." "${repository}" "${target_arch}"
|
||||||
|
|
||||||
${create_first} && create_chroot "${mkchroot_args[@]}" "${work_dir}/root" "${packages[@]}"
|
for copy in "${work_dir}"/*; do
|
||||||
|
[[ -d $copy ]] || continue
|
||||||
|
msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
|
||||||
|
|
||||||
|
lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
|
||||||
|
|
||||||
|
subvolume_delete_recursive "${copy}"
|
||||||
|
rm -rf --one-file-system "${copy}"
|
||||||
|
done
|
||||||
|
lock_close 9
|
||||||
|
|
||||||
|
rm -rf --one-file-system "${work_dir}"
|
||||||
|
mkdir -p "${work_dir}"
|
||||||
|
setarch "${target_arch}" mkchroot \
|
||||||
|
"${mkchroot_args[@]}" "${base_devel[@]}" || abort
|
||||||
|
else
|
||||||
|
lock 9 "${work_dir}/root.lock" "Locking clean chroot"
|
||||||
|
chroot-run "${mkchroot_args[@]}" \
|
||||||
|
pacman -Syu --noconfirm || abort
|
||||||
|
fi
|
||||||
|
|
||||||
build "${package}"
|
build "${package}"
|
||||||
|
@@ -13,43 +13,35 @@ version=@version@
|
|||||||
|
|
||||||
LIBDIR='@libdir@'
|
LIBDIR='@libdir@'
|
||||||
SYSCONFDIR='@sysconfdir@'
|
SYSCONFDIR='@sysconfdir@'
|
||||||
|
DATADIR='@datadir@'
|
||||||
|
|
||||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
|
import ${LIBDIR}/util-pkg.sh
|
||||||
import ${LIBDIR}/util-pkg-tree.sh
|
import ${LIBDIR}/util-pkg-tree.sh
|
||||||
|
|
||||||
show_imports(){
|
|
||||||
for repo in ${repo_tree_import[@]};do
|
|
||||||
read_import_list "$repo"
|
|
||||||
for p in ${import_list[@]};do
|
|
||||||
msg2 "%s: %s" ""$repo "$p"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
display_settings(){
|
display_settings(){
|
||||||
show_version
|
show_version
|
||||||
show_config
|
show_config
|
||||||
|
|
||||||
msg "REPOS:"
|
msg "REPOS:"
|
||||||
|
msg2 "repo_tree_artix: %s" "${repo_tree_artix[*]}"
|
||||||
msg2 "repo_tree_arch: %s" "${repo_tree_arch[*]}"
|
msg2 "repo_tree_arch: %s" "${repo_tree_arch[*]}"
|
||||||
msg2 "repo_tree_import: %s" "${repo_tree_import[*]}"
|
|
||||||
|
msg "OPTIONS:"
|
||||||
|
msg2 "repository: %s" "${repository}"
|
||||||
|
|
||||||
msg "ARGS:"
|
msg "ARGS:"
|
||||||
msg2 "verbose: %s" "${verbose}"
|
msg2 "artix: %s" "${artix}"
|
||||||
msg2 "arch: %s" "${arch}"
|
msg2 "arch: %s" "${arch}"
|
||||||
|
msg2 "compare: %s" "${compare}"
|
||||||
msg2 "import_arch: %s" "${import_arch}"
|
msg2 "import_arch: %s" "${import_arch}"
|
||||||
|
# msg2 "gitpush: %s" "${gitpush}"
|
||||||
|
|
||||||
msg "PATHS:"
|
msg "PATHS:"
|
||||||
msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
|
msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
|
||||||
msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
|
msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
|
||||||
|
msg2 "patches_dir: %s" "${patches_dir}/${repository}"
|
||||||
if ${verbose}; then
|
|
||||||
if ${import_arch};then
|
|
||||||
msg "IMPORT QUEUE:"
|
|
||||||
show_imports
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
load_user_info
|
load_user_info
|
||||||
@@ -58,16 +50,22 @@ load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artoo
|
|||||||
|
|
||||||
pretend=false
|
pretend=false
|
||||||
arch=false
|
arch=false
|
||||||
|
artix=false
|
||||||
|
compare=false
|
||||||
import_arch=false
|
import_arch=false
|
||||||
verbose=false
|
# gitpush=false
|
||||||
|
repository='system' #${PWD##*/}
|
||||||
|
|
||||||
rsync_args=(-aWx --progress --delete --no-R --no-implied-dirs)
|
rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options]"
|
echo "Usage: ${0##*/} [options]"
|
||||||
|
echo " -r <repo> Repository [default:${repository}]"
|
||||||
echo " -a Sync arch tree"
|
echo " -a Sync arch tree"
|
||||||
|
echo " -s Sync artix tree"
|
||||||
|
echo " -c Compare artix and arch versions"
|
||||||
echo ' -i Import arch packages'
|
echo ' -i Import arch packages'
|
||||||
echo ' -v Verbose import output'
|
# echo ' -p Push import packages'
|
||||||
echo ' -q Query settings'
|
echo ' -q Query settings'
|
||||||
echo ' -h This help'
|
echo ' -h This help'
|
||||||
echo ''
|
echo ''
|
||||||
@@ -77,13 +75,17 @@ usage() {
|
|||||||
|
|
||||||
orig_argv=("$0" "$@")
|
orig_argv=("$0" "$@")
|
||||||
|
|
||||||
opts='aivqh'
|
# opts='r:aipscqh'
|
||||||
|
opts='r:aiscqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
|
r) repository="$OPTARG" ;;
|
||||||
a) arch=true ;;
|
a) arch=true ;;
|
||||||
|
s) artix=true ;;
|
||||||
|
c) compare=true ;;
|
||||||
i) import_arch=true ;;
|
i) import_arch=true ;;
|
||||||
v) verbose=true; rsync_args+=(-v --stats) ;;
|
# p) gitpush=true ;;
|
||||||
q) pretend=true ;;
|
q) pretend=true ;;
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
@@ -94,9 +96,14 @@ shift $(($OPTIND - 1))
|
|||||||
|
|
||||||
prepare_dir "${tree_dir_artix}"
|
prepare_dir "${tree_dir_artix}"
|
||||||
prepare_dir "${tree_dir_arch}"
|
prepare_dir "${tree_dir_arch}"
|
||||||
|
prepare_dir "${patches_dir}/${repository}"
|
||||||
|
|
||||||
${pretend} && display_settings && exit 1
|
${pretend} && display_settings && exit 1
|
||||||
|
|
||||||
|
${artix} && sync_tree_artix
|
||||||
|
|
||||||
${arch} && sync_tree_arch
|
${arch} && sync_tree_arch
|
||||||
|
|
||||||
${import_arch} && import_from_arch
|
${compare} && show_version_table "${repository}"
|
||||||
|
|
||||||
|
${import_arch} && import_from_arch "${repository}" #"${gitpush}"
|
||||||
|
114
bin/buildyaml.in
114
bin/buildyaml.in
@@ -1,114 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; version 2 of the License.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
|
|
||||||
version=@version@
|
|
||||||
|
|
||||||
LIBDIR='@libdir@'
|
|
||||||
DATADIR='@datadir@'
|
|
||||||
SYSCONFDIR='@sysconfdir@'
|
|
||||||
|
|
||||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
|
||||||
import ${LIBDIR}/util.sh
|
|
||||||
import ${LIBDIR}/util-yaml-check.sh
|
|
||||||
import ${LIBDIR}/util-profile.sh
|
|
||||||
|
|
||||||
show_profile(){
|
|
||||||
prepare_build
|
|
||||||
msg2 "yaml_dir: %s" "${yaml_dir}"
|
|
||||||
msg2 "autologin: %s" "${autologin}"
|
|
||||||
|
|
||||||
msg2 "netgroups: %s" "$(get_yaml)"
|
|
||||||
|
|
||||||
msg2 "hostname: %s" "${hostname}"
|
|
||||||
msg2 "username: %s" "${username}"
|
|
||||||
msg2 "password: %s" "${password}"
|
|
||||||
msg2 "addgroups: %s" "${addgroups}"
|
|
||||||
|
|
||||||
msg2 "enable_live: %s" "${enable_live[*]}"
|
|
||||||
msg2 "openrc_boot: %s" "${openrc_boot[*]}"
|
|
||||||
msg2 "openrc_default: %s" "${openrc_default[*]}"
|
|
||||||
|
|
||||||
reset_profile
|
|
||||||
unset yaml_dir
|
|
||||||
}
|
|
||||||
|
|
||||||
display_settings(){
|
|
||||||
show_version
|
|
||||||
show_config
|
|
||||||
|
|
||||||
msg "OPTIONS:"
|
|
||||||
msg2 "profile: %s" "${profile}"
|
|
||||||
msg2 "arch: %s" "${target_arch}"
|
|
||||||
msg2 "initsys: %s" "${initsys}"
|
|
||||||
msg2 "kernel: %s" "${kernel}"
|
|
||||||
|
|
||||||
msg "ARGS:"
|
|
||||||
msg2 "calamares: %s" "${calamares}"
|
|
||||||
msg2 "group: %s" "${group}"
|
|
||||||
|
|
||||||
msg "BUILD:"
|
|
||||||
show_profile
|
|
||||||
}
|
|
||||||
|
|
||||||
load_user_info
|
|
||||||
|
|
||||||
load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
|
|
||||||
|
|
||||||
# to force old way to have buildiso run in iso-profiles dir
|
|
||||||
# run_dir=$(pwd)
|
|
||||||
|
|
||||||
load_run_dir
|
|
||||||
|
|
||||||
calamares=false
|
|
||||||
pretend=false
|
|
||||||
group=false
|
|
||||||
cache_dir_netinstall="${workspace_dir}/netinstall"
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
echo "Usage: ${0##*/} [options]"
|
|
||||||
echo " -p <profile> Buildset or profile [default: ${profile}]"
|
|
||||||
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 ' -g Enable pacman group accepted for -p'
|
|
||||||
echo ' -q Query settings'
|
|
||||||
echo ' -h This help'
|
|
||||||
echo ''
|
|
||||||
echo ''
|
|
||||||
exit $1
|
|
||||||
}
|
|
||||||
|
|
||||||
orig_argv=("$0" "$@")
|
|
||||||
|
|
||||||
opts='p:a:i:k:gcqh'
|
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
|
||||||
case "${arg}" in
|
|
||||||
p) profile="$OPTARG" ;;
|
|
||||||
a) target_arch="$OPTARG" ;;
|
|
||||||
i) initsys="$OPTARG" ;;
|
|
||||||
k) kernel="$OPTARG" ;;
|
|
||||||
c) calamares=true ;;
|
|
||||||
g) group=true ;;
|
|
||||||
q) pretend=true ;;
|
|
||||||
h|?) usage 0 ;;
|
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
shift $(($OPTIND - 1))
|
|
||||||
|
|
||||||
${pretend} && display_settings && exit 1
|
|
||||||
|
|
||||||
${group} && write_pacman_group_yaml "${profile}" && exit 0
|
|
||||||
|
|
||||||
build
|
|
@@ -14,6 +14,7 @@ version=@version@
|
|||||||
LIBDIR='@libdir@'
|
LIBDIR='@libdir@'
|
||||||
|
|
||||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||||
|
import ${LIBDIR}/util.sh
|
||||||
import ${LIBDIR}/util-pkg.sh
|
import ${LIBDIR}/util-pkg.sh
|
||||||
|
|
||||||
shopt -s extglob
|
shopt -s extglob
|
||||||
|
@@ -15,6 +15,7 @@ LIBDIR='@libdir@'
|
|||||||
|
|
||||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
|
import ${LIBDIR}/util-chroot.sh
|
||||||
import ${LIBDIR}/util-mount.sh
|
import ${LIBDIR}/util-mount.sh
|
||||||
|
|
||||||
working_dir=''
|
working_dir=''
|
||||||
@@ -91,6 +92,7 @@ copy_hostconf () {
|
|||||||
|
|
||||||
chroot_extra_mount() {
|
chroot_extra_mount() {
|
||||||
chroot_mount "/etc/resolv.conf" "$1/etc/resolv.conf" -B
|
chroot_mount "/etc/resolv.conf" "$1/etc/resolv.conf" -B
|
||||||
|
chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
|
||||||
chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
|
chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
|
||||||
|
|
||||||
for cache_dir in ${cache_dirs[@]:1}; do
|
for cache_dir in ${cache_dirs[@]:1}; do
|
||||||
@@ -126,3 +128,9 @@ eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
|
|||||||
${nosetarch} && unset CARCH
|
${nosetarch} && unset CARCH
|
||||||
|
|
||||||
${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
|
${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
|
||||||
|
|
||||||
|
ret=$?
|
||||||
|
|
||||||
|
kill_chroot_process "${working_dir}"
|
||||||
|
|
||||||
|
exit $ret
|
||||||
|
@@ -25,7 +25,6 @@ display_settings(){
|
|||||||
msg "OPTIONS:"
|
msg "OPTIONS:"
|
||||||
msg2 "profile: %s" "${profile}"
|
msg2 "profile: %s" "${profile}"
|
||||||
msg2 "uplimit: %s kB/s" "${uplimit}"
|
msg2 "uplimit: %s kB/s" "${uplimit}"
|
||||||
# msg2 "dist_release: %s" "${dist_release}"
|
|
||||||
|
|
||||||
msg "ARGS:"
|
msg "ARGS:"
|
||||||
msg2 "update: %s" "${update}"
|
msg2 "update: %s" "${update}"
|
||||||
@@ -41,7 +40,7 @@ display_settings(){
|
|||||||
|
|
||||||
msg "REMOTE:"
|
msg "REMOTE:"
|
||||||
msg2 "account: %s" "${account}"
|
msg2 "account: %s" "${account}"
|
||||||
msg2 "host: %s" "${host}"
|
msg2 "file_host: %s" "${file_host}"
|
||||||
msg2 "project: %s" "${project}"
|
msg2 "project: %s" "${project}"
|
||||||
|
|
||||||
msg "UPLOAD:"
|
msg "UPLOAD:"
|
||||||
@@ -79,7 +78,7 @@ opts='p:l:uvtqh'
|
|||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
p) profile="$OPTARG" ;;
|
p) profile="$OPTARG" ;;
|
||||||
l) limit="$OPTARG" ;;
|
l) uplimit="$OPTARG" ;;
|
||||||
u) update=true; rsync_args+=(-u) ;;
|
u) update=true; rsync_args+=(-u) ;;
|
||||||
t) torrent=true ;;
|
t) torrent=true ;;
|
||||||
v) verbose=true; rsync_args+=(-v --stats) ;;
|
v) verbose=true; rsync_args+=(-v --stats) ;;
|
||||||
|
@@ -18,66 +18,48 @@ SYSCONFDIR='@sysconfdir@'
|
|||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
import ${LIBDIR}/util-pkg-publish.sh
|
import ${LIBDIR}/util-pkg-publish.sh
|
||||||
|
|
||||||
show_transfer(){
|
|
||||||
local repo="$1"
|
|
||||||
msg2 "local: %s" "${repos_local}/$repo/"
|
|
||||||
msg2 "remote: %s" "${repos_remote}/$repo/"
|
|
||||||
}
|
|
||||||
|
|
||||||
display_settings(){
|
display_settings(){
|
||||||
show_version
|
show_version
|
||||||
show_config
|
show_config
|
||||||
|
|
||||||
msg "OPTIONS:"
|
msg "OPTIONS:"
|
||||||
msg2 "repository: %s" "${repository}"
|
msg2 "repository: %s" "${repository}"
|
||||||
msg2 "package: %s" "${package}"
|
msg2 "to_repository: %s" "${to_repository}"
|
||||||
|
msg2 "package: %s" "${package[@]}"
|
||||||
msg2 "target_arch: %s" "${target_arch}"
|
msg2 "target_arch: %s" "${target_arch}"
|
||||||
|
|
||||||
msg "ARGS:"
|
msg "ARGS:"
|
||||||
msg2 "add_pkg: %s" "${add_pkg}"
|
msg2 "add_pkg: %s" "${add_pkg}"
|
||||||
msg2 "del_pkg: %s" "${del_pkg}"
|
msg2 "del_pkg: %s" "${del_pkg}"
|
||||||
msg2 "copy_pkg: %s" "${copy_pkg}"
|
msg2 "move_pkg: %s" "${move_pkg}"
|
||||||
msg2 "download: %s" "${download}"
|
|
||||||
msg2 "upload: %s" "${upload}"
|
|
||||||
msg2 "verbose: %s" "${verbose}"
|
|
||||||
|
|
||||||
msg "REMOTE:"
|
|
||||||
msg2 "account: %s" "${account}"
|
|
||||||
msg2 "host: %s" "${host}"
|
|
||||||
msg2 "project: %s" "${project}"
|
|
||||||
|
|
||||||
msg "SYNC:"
|
|
||||||
show_transfer "${repository}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
load_user_info
|
load_user_info
|
||||||
|
|
||||||
load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
|
load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
|
||||||
|
load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
||||||
|
load_vars /etc/makepkg.conf
|
||||||
|
|
||||||
pretend=false
|
pretend=false
|
||||||
upload=false
|
|
||||||
download=false
|
|
||||||
verbose=false
|
|
||||||
verbose=false
|
|
||||||
add_pkg=false
|
add_pkg=false
|
||||||
del_pkg=false
|
del_pkg=false
|
||||||
copy_pkg=false
|
move_pkg=false
|
||||||
package=''
|
package=''
|
||||||
|
repository=${PWD##*/}
|
||||||
|
to_repository=${PWD##*/}
|
||||||
|
|
||||||
rsync_args=(-rtxisP --progress --delete -e ssh)
|
rsync_args=(-rtxisP --progress --delete -e ssh)
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options]"
|
echo "Usage: ${0##*/} [options]"
|
||||||
echo " -a Repository arch [default:${target_arch}]"
|
echo " -a Repository arch [default:${target_arch}]"
|
||||||
echo " -r Repository to sync [default:${repository}]"
|
echo " -r Repository [default:${repository}]"
|
||||||
echo " -u Upload repository"
|
echo " -t Repository to move to [default:${to_repository}]"
|
||||||
echo ' -d Download repository'
|
|
||||||
echo " -p Package name to add/delete"
|
echo " -p Package name to add/delete"
|
||||||
echo ' -x Add package to repository'
|
echo ' -x Add package to repository'
|
||||||
echo ' -c Copy instead of symlink package to repository'
|
|
||||||
echo ' -y Delete package from repository'
|
echo ' -y Delete package from repository'
|
||||||
|
echo ' -m Move packages from source to destination repository'
|
||||||
echo ' -q Query settings and pretend upload'
|
echo ' -q Query settings and pretend upload'
|
||||||
echo ' -v Verbose output'
|
|
||||||
echo ' -h This help'
|
echo ' -h This help'
|
||||||
echo ''
|
echo ''
|
||||||
echo ''
|
echo ''
|
||||||
@@ -86,20 +68,18 @@ usage() {
|
|||||||
|
|
||||||
orig_argv=("$0" "$@")
|
orig_argv=("$0" "$@")
|
||||||
|
|
||||||
opts='p:a:r:xyducvqh'
|
opts='p:a:r:t:xymqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
a) target_arch="$OPTARG" ;;
|
a) target_arch="$OPTARG" ;;
|
||||||
r) repository="$OPTARG" ;;
|
r) repository="$OPTARG" ;;
|
||||||
p) package="$OPTARG" ;;
|
p) package="$OPTARG" ;;
|
||||||
|
t) to_repository="$OPTARG" ;;
|
||||||
|
m) move_pkg=true ;;
|
||||||
x) add_pkg=true ;;
|
x) add_pkg=true ;;
|
||||||
y) del_pkg=true ;;
|
y) del_pkg=true ;;
|
||||||
c) copy_pkg=true ;;
|
q) pretend=true ;;
|
||||||
d) download=true ;;
|
|
||||||
u) upload=true; rsync_args+=(-L) ;;
|
|
||||||
v) verbose=true; rsync_args+=(-v --stats) ;;
|
|
||||||
q) pretend=true; rsync_args+=(-n) ;;
|
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
@@ -109,12 +89,14 @@ shift $(($OPTIND - 1))
|
|||||||
|
|
||||||
timer_start=$(get_timer)
|
timer_start=$(get_timer)
|
||||||
|
|
||||||
prepare_dir "${repos_local}"
|
prepare_dir "${repos_root}"
|
||||||
|
|
||||||
${pretend} && display_settings #&& exit 1
|
${pretend} && display_settings && exit 1
|
||||||
|
|
||||||
${add_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "add" "${copy_pkg}"
|
${move_pkg} && move_to_repo "${repository}" "${to_repository}" "${target_arch}"
|
||||||
${del_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "remove"
|
|
||||||
|
|
||||||
${download} && repo_download "${repository}"
|
${del_pkg} && del_from_repo "${repository}" "${target_arch}" "${package}"
|
||||||
${upload} && repo_upload "${repository}"
|
|
||||||
|
${add_pkg} && add_to_repo "${repository}" "${target_arch}" "${package}"
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
53
bin/findupdates.in
Normal file
53
bin/findupdates.in
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; version 2 of the License.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
version=@version@
|
||||||
|
|
||||||
|
LIBDIR='@libdir@'
|
||||||
|
|
||||||
|
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||||
|
|
||||||
|
import ${LIBDIR}/util.sh
|
||||||
|
import ${LIBDIR}/util-pkg.sh
|
||||||
|
import ${LIBDIR}/util-pkg-tree.sh
|
||||||
|
|
||||||
|
load_user_info
|
||||||
|
|
||||||
|
load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
|
||||||
|
|
||||||
|
declare -A UPDATES
|
||||||
|
msg_table_header "%-30s %-30s %-30s %-30s" "Repository" "Package" "Artix version" "Arch version"
|
||||||
|
for repo in ${repo_tree_artix[@]}; do
|
||||||
|
for pkg in ${tree_dir_artix}/$repo/*; do
|
||||||
|
if [[ -f $pkg/PKGBUILD ]];then
|
||||||
|
source $pkg/PKGBUILD 2>/dev/null
|
||||||
|
package=${pkg##*/}
|
||||||
|
artixver=$(get_full_version $package)
|
||||||
|
src=$(get_import_path "$repo" "$package")
|
||||||
|
if [[ -f $src/PKGBUILD ]];then
|
||||||
|
source $src/PKGBUILD 2>/dev/null
|
||||||
|
archver=$(get_full_version $package)
|
||||||
|
fi
|
||||||
|
if [ $(vercmp $artixver $archver) -lt 0 ];then
|
||||||
|
UPDATES[$package]="$src/PKGBUILD $pkg/PKGBUILD"
|
||||||
|
msg_row_update "%-30s %-30s %-30s %-30s" "$repo" "$package" "$artixver" "$archver"
|
||||||
|
else
|
||||||
|
msg_row "%-30s %-30s %-30s %-30s" "$repo" "$package" "$artixver" "$archver"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
unset pkgver epoch pkgrel artixver archver package
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
for upd in "${!UPDATES[@]}"; do
|
||||||
|
msg "Diff: %s" "$upd"
|
||||||
|
diff -u ${UPDATES[$upd]}
|
||||||
|
done
|
@@ -64,6 +64,13 @@ optstring_apply_quirks() {
|
|||||||
# one might install Arch from a Fedora environment), so let's remove it.
|
# one might install Arch from a Fedora environment), so let's remove it.
|
||||||
optstring_remove_option "$varname" seclabel
|
optstring_remove_option "$varname" seclabel
|
||||||
|
|
||||||
|
# Prune 'relatime' option for any pseudofs. This seems to be a rampant
|
||||||
|
# default which the kernel often exports even if the underlying filesystem
|
||||||
|
# doesn't support it. Example: https://bugs.archlinux.org/task/54554.
|
||||||
|
if awk -v fstype="$fstype" '$1 == fstype { exit 1 }' /proc/filesystems; then
|
||||||
|
optstring_remove_option "$varname" relatime
|
||||||
|
fi
|
||||||
|
|
||||||
case $fstype in
|
case $fstype in
|
||||||
f2fs)
|
f2fs)
|
||||||
# These are Kconfig options for f2fs. Kernels supporting the options will
|
# These are Kconfig options for f2fs. Kernels supporting the options will
|
||||||
|
26
bin/lddd.in
26
bin/lddd.in
@@ -21,15 +21,15 @@ IFS="${IFS}:"
|
|||||||
libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)"
|
libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)"
|
||||||
extras=
|
extras=
|
||||||
|
|
||||||
TMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX)
|
TEMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX)
|
||||||
|
|
||||||
msg 'Go out and drink some tea, this will take a while :) ...'
|
msg 'Go out and drink some tea, this will take a while :) ...'
|
||||||
# Check ELF binaries in the PATH and specified dir trees.
|
# Check ELF binaries in the PATH and specified dir trees.
|
||||||
for tree in $PATH $libdirs $extras; do
|
for tree in $PATH $libdirs $extras; do
|
||||||
msg2 "DIR $tree"
|
msg2 "DIR %s" "$tree"
|
||||||
|
|
||||||
# Get list of files in tree.
|
# Get list of files in tree.
|
||||||
files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
|
files=$(find "$tree" -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
|
||||||
-name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name \
|
-name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name \
|
||||||
'*.cmi' ! -name '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' \
|
'*.cmi' ! -name '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' \
|
||||||
! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' \
|
! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' \
|
||||||
@@ -37,22 +37,22 @@ for tree in $PATH $libdirs $extras; do
|
|||||||
-name '*.mcopclass' ! -name '*.mcoptype')
|
-name '*.mcopclass' ! -name '*.mcoptype')
|
||||||
IFS=$ifs
|
IFS=$ifs
|
||||||
for i in $files; do
|
for i in $files; do
|
||||||
if (( $(file $i | grep -c 'ELF') != 0 )); then
|
if (( $(file "$i" | grep -c 'ELF') != 0 )); then
|
||||||
# Is an ELF binary.
|
# Is an ELF binary.
|
||||||
if (( $(ldd $i 2>/dev/null | grep -c 'not found') != 0 )); then
|
if (( $(ldd "$i" 2>/dev/null | grep -c 'not found') != 0 )); then
|
||||||
# Missing lib.
|
# Missing lib.
|
||||||
echo "$i:" >> $TMPDIR/raw.txt
|
echo "$i:" >> "$TEMPDIR/raw.txt"
|
||||||
ldd $i 2>/dev/null | grep 'not found' >> $TMPDIR/raw.txt
|
ldd "$i" 2>/dev/null | grep 'not found' >> "$TEMPDIR/raw.txt"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
grep '^/' $TMPDIR/raw.txt | sed -e 's/://g' >> $TMPDIR/affected-files.txt
|
grep '^/' "$TEMPDIR/raw.txt" | sed -e 's/://g' >> "$TEMPDIR/affected-files.txt"
|
||||||
# invoke pacman
|
# invoke pacman
|
||||||
for i in $(cat $TMPDIR/affected-files.txt); do
|
while read -r i; do
|
||||||
pacman -Qo $i | awk '{print $4,$5}' >> $TMPDIR/pacman.txt
|
pacman -Qo "$i" | awk '{print $4,$5}' >> "$TEMPDIR/pacman.txt"
|
||||||
done
|
done < "$TEMPDIR/affected-files.txt"
|
||||||
# clean list
|
# clean list
|
||||||
sort -u $TMPDIR/pacman.txt >> $TMPDIR/possible-rebuilds.txt
|
sort -u "$TEMPDIR/pacman.txt" >> "$TEMPDIR/possible-rebuilds.txt"
|
||||||
|
|
||||||
msg "Files saved to $TMPDIR"
|
msg "Files saved to %s" "$TEMPDIR"
|
||||||
|
@@ -19,29 +19,6 @@ import ${LIBDIR}/util-chroot.sh
|
|||||||
|
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
|
|
||||||
init_variables() {
|
|
||||||
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
|
||||||
makepkg_args=("${default_makepkg_args[@]}")
|
|
||||||
repack=false
|
|
||||||
update_first=false
|
|
||||||
clean_first=false
|
|
||||||
run_namcap=false
|
|
||||||
temp_chroot=false
|
|
||||||
chrootdir=
|
|
||||||
passeddir=
|
|
||||||
makepkg_user=
|
|
||||||
declare -ga install_pkgs
|
|
||||||
declare -gi ret=0
|
|
||||||
|
|
||||||
bindmounts_ro=()
|
|
||||||
bindmounts_rw=()
|
|
||||||
|
|
||||||
copy=$USER
|
|
||||||
[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
|
|
||||||
[[ -z "$copy" || $copy = root ]] && copy=copy
|
|
||||||
src_owner=${SUDO_USER:-$USER}
|
|
||||||
}
|
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
|
echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
|
||||||
echo ' Run this script in a PKGBUILD dir to build a package inside a'
|
echo ' Run this script in a PKGBUILD dir to build a package inside a'
|
||||||
@@ -121,24 +98,24 @@ sync_chroot() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Usage: delete_chroot $copydir [$copy]
|
# Usage: delete_chroot $copydir [$copy]
|
||||||
# delete_chroot() {
|
delete_chroot() {
|
||||||
# local copydir=$1
|
local copydir=$1
|
||||||
# local copy=${1:-$2}
|
local copy=${1:-$2}
|
||||||
#
|
|
||||||
# stat_busy "Removing chroot copy [%s]" "$copy"
|
stat_busy "Removing chroot copy [%s]" "$copy"
|
||||||
# if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
|
if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
|
||||||
# subvolume_delete_recursive "$copydir" ||
|
subvolume_delete_recursive "$copydir" ||
|
||||||
# die "Unable to delete subvolume %s" "$copydir"
|
die "Unable to delete subvolume %s" "$copydir"
|
||||||
# else
|
else
|
||||||
# # avoid change of filesystem in case of an umount failure
|
# avoid change of filesystem in case of an umount failure
|
||||||
# rm --recursive --force --one-file-system "$copydir" ||
|
rm --recursive --force --one-file-system "$copydir" ||
|
||||||
# die "Unable to delete %s" "$copydir"
|
die "Unable to delete %s" "$copydir"
|
||||||
# fi
|
fi
|
||||||
#
|
|
||||||
# # remove lock file
|
# remove lock file
|
||||||
# rm -f "$copydir.lock"
|
rm -f "$copydir.lock"
|
||||||
# stat_done
|
stat_done
|
||||||
# }
|
}
|
||||||
|
|
||||||
# Usage: install_packages $copydir $pkgs...
|
# Usage: install_packages $copydir $pkgs...
|
||||||
install_packages() {
|
install_packages() {
|
||||||
@@ -159,17 +136,17 @@ install_packages() {
|
|||||||
return $ret
|
return $ret
|
||||||
}
|
}
|
||||||
|
|
||||||
# Usage: prepare_chroot $copydir $HOME $repack $run_namcap
|
# Usage: prepare_chroot $copydir $HOME $keepbuilddir $run_namcap
|
||||||
# Globals:
|
# Globals:
|
||||||
# - MAKEFLAGS
|
# - MAKEFLAGS
|
||||||
# - PACKAGER
|
# - PACKAGER
|
||||||
prepare_chroot() {
|
prepare_chroot() {
|
||||||
local copydir=$1
|
local copydir=$1
|
||||||
local USER_HOME=$2
|
local USER_HOME=$2
|
||||||
local repack=$3
|
local keepbuilddir=$3
|
||||||
local run_namcap=$4
|
local run_namcap=$4
|
||||||
|
|
||||||
$repack || rm -rf "$copydir/build"
|
$keepbuilddir || rm -rf "$copydir/build"
|
||||||
|
|
||||||
local builduser_uid="${SUDO_UID:-$UID}"
|
local builduser_uid="${SUDO_UID:-$UID}"
|
||||||
local builduser_gid="$(id -g "$builduser_uid")"
|
local builduser_gid="$(id -g "$builduser_uid")"
|
||||||
@@ -221,6 +198,7 @@ EOF
|
|||||||
# These functions aren't run in makechrootpkg,
|
# These functions aren't run in makechrootpkg,
|
||||||
# so no global variables
|
# so no global variables
|
||||||
_chrootbuild() {
|
_chrootbuild() {
|
||||||
|
exec </dev/console
|
||||||
export LANG=en_US.UTF-8
|
export LANG=en_US.UTF-8
|
||||||
. /etc/profile
|
. /etc/profile
|
||||||
sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
|
||||||
@@ -292,7 +270,26 @@ move_products() {
|
|||||||
orig_argv=("$0" "$@")
|
orig_argv=("$0" "$@")
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
init_variables
|
default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
|
||||||
|
makepkg_args=("${default_makepkg_args[@]}")
|
||||||
|
keepbuilddir=false
|
||||||
|
update_first=false
|
||||||
|
clean_first=false
|
||||||
|
run_namcap=false
|
||||||
|
temp_chroot=false
|
||||||
|
chrootdir=
|
||||||
|
passeddir=
|
||||||
|
makepkg_user=
|
||||||
|
declare -ga install_pkgs
|
||||||
|
declare -gi ret=0
|
||||||
|
|
||||||
|
bindmounts_ro=()
|
||||||
|
bindmounts_rw=()
|
||||||
|
|
||||||
|
copy=$USER
|
||||||
|
[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
|
||||||
|
[[ -z "$copy" || $copy = root ]] && copy=copy
|
||||||
|
src_owner=${SUDO_USER:-$USER}
|
||||||
|
|
||||||
local opts='hcur:I:l:nTD:d:U:'
|
local opts='hcur:I:l:nTD:d:U:'
|
||||||
|
|
||||||
@@ -332,13 +329,13 @@ main() {
|
|||||||
# Pass all arguments after -- right to makepkg
|
# Pass all arguments after -- right to makepkg
|
||||||
makepkg_args+=("${@:$OPTIND}")
|
makepkg_args+=("${@:$OPTIND}")
|
||||||
|
|
||||||
# See if -R was passed to makepkg
|
# See if -R or -e was passed to makepkg
|
||||||
for arg in "${@:OPTIND}"; do
|
for arg in "${makepkg_args[@]}"; do
|
||||||
case ${arg%%=*} in
|
case ${arg%%=*} in
|
||||||
-*R*|--repackage)
|
--repackage|--noextract) keepbuilddir=true; break ;;
|
||||||
repack=true
|
--repackage|--noextract) keepbuilddir=true; break ;;
|
||||||
break 2
|
--*) ;;
|
||||||
;;
|
-*R*|-*e*) keepbuilddir=true; break ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -379,7 +376,7 @@ main() {
|
|||||||
|
|
||||||
download_sources "$copydir" "$src_owner"
|
download_sources "$copydir" "$src_owner"
|
||||||
|
|
||||||
prepare_chroot "$copydir" "$USER_HOME" "$repack" "$run_namcap"
|
prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir"
|
||||||
|
|
||||||
bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
|
bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
|
||||||
|
|
||||||
|
@@ -21,10 +21,16 @@ load_user_info
|
|||||||
load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
|
||||||
load_vars /etc/makepkg.conf
|
load_vars /etc/makepkg.conf
|
||||||
|
|
||||||
|
file_to_sign="$1"
|
||||||
|
|
||||||
if [ ! -e "$1" ]; then
|
if [ ! -e "$1" ]; then
|
||||||
error "%s does not exist!" "$1"
|
error "%s does not exist!" "$file_to_sign"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
msg2 "Signing [%s] with key %s" "${1##*/}" "${GPGKEY}..."
|
msg2 "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
|
||||||
gpg --detach-sign --use-agent -u "${GPGKEY}" "$1"
|
if [[ -n "${BUILDBOT_GPGP}" ]]; then
|
||||||
|
gpg --batch --passphrase "${BUILDBOT_GPGP}" --detach-sign "$file_to_sign"
|
||||||
|
else
|
||||||
|
gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
|
||||||
|
fi
|
||||||
|
@@ -1,14 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; version 2 of the License.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
|
|
||||||
version=@version@
|
|
||||||
|
|
||||||
find $PWD -maxdepth 1 -name '*.pkg.tar.xz' -exec signfile {} \;
|
|
@@ -2,14 +2,58 @@
|
|||||||
################ artools-base ###############
|
################ artools-base ###############
|
||||||
#############################################
|
#############################################
|
||||||
|
|
||||||
# default taget arch: auto detect
|
|
||||||
# target_arch=$(uname -m)
|
|
||||||
|
|
||||||
# build dir where buildpkg or buildiso chroots are created
|
# build dir where buildpkg or buildiso chroots are created
|
||||||
# chroots_dir=/var/lib/artools
|
# chroots_dir=/var/lib/artools
|
||||||
|
|
||||||
# custom build mirror server
|
# the workspace directory
|
||||||
# build_mirror=https://netcologne.dl.sourceforge.net/project/artix-linux/repos
|
# workspace_dir="/home/${OWNER}/artools-workspace"
|
||||||
|
|
||||||
|
#############################################
|
||||||
|
################ artools-pkg ################
|
||||||
|
#############################################
|
||||||
|
|
||||||
|
# artix package tree
|
||||||
|
# repo_tree_artix=('system' 'world' 'galaxy' 'lib32')
|
||||||
|
|
||||||
|
# host_tree_artix='https://github.com/artix-linux'
|
||||||
|
|
||||||
|
# archlinux package tree
|
||||||
|
# repo_tree_arch=('packages' 'community')
|
||||||
|
|
||||||
|
# host_tree_arch=git://projects.archlinux.org/svntogit
|
||||||
|
|
||||||
|
# default repos root
|
||||||
|
# repos_root=${workspace_dir}/repos
|
||||||
|
|
||||||
|
#############################################
|
||||||
|
################ artools-iso ################
|
||||||
|
#############################################
|
||||||
|
|
||||||
|
# the iso storage directory
|
||||||
|
# iso_pool="${workspace_dir}/iso"
|
||||||
|
|
||||||
|
# the dist release; default: auto
|
||||||
|
# iso_version=$(date +%Y%m%d)
|
||||||
|
|
||||||
|
# possible values: openrc, (s6, runit) not yet supported
|
||||||
|
# initsys="openrc"
|
||||||
|
|
||||||
|
# unset defaults to given value
|
||||||
|
# kernel="linux-lts"
|
||||||
|
|
||||||
|
# custom additional kernel args
|
||||||
|
# kernel_args=""
|
||||||
|
|
||||||
|
# gpg key; leave empty or commented to skip sfs signing
|
||||||
|
# gpgkey=""
|
||||||
|
|
||||||
|
# set upload bandwidth limit in kB/s
|
||||||
|
# uplimit=100
|
||||||
|
|
||||||
|
# the torrent tracker urls, comma separated
|
||||||
|
# tracker_url='udp://mirror.strits.dk:6969'
|
||||||
|
|
||||||
|
# file_host="sourceforge.net"
|
||||||
|
|
||||||
# the server user
|
# the server user
|
||||||
# account=[SetUser]
|
# account=[SetUser]
|
||||||
@@ -20,54 +64,5 @@
|
|||||||
# host mirrors
|
# host mirrors
|
||||||
# host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
|
# host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
|
||||||
|
|
||||||
# the workspace directory
|
|
||||||
# workspace_dir="/home/${OWNER}/artools-workspace"
|
|
||||||
|
|
||||||
#############################################
|
|
||||||
################ artools-pkg ################
|
|
||||||
#############################################
|
|
||||||
|
|
||||||
# artix import tree
|
|
||||||
# repo_tree_import=('system-arch' 'world-arch' 'galaxy-arch')
|
|
||||||
|
|
||||||
# host_tree_artix=https://github.com/artix-linux
|
|
||||||
|
|
||||||
# archlinux package tree
|
|
||||||
# repo_tree_arch=('packages' 'community')
|
|
||||||
|
|
||||||
# host_tree_arch=git://projects.archlinux.org/svntogit
|
|
||||||
|
|
||||||
# default repos root
|
|
||||||
# repos_local=${workspace_dir}/repos
|
|
||||||
|
|
||||||
#############################################
|
|
||||||
################ artools-iso ################
|
|
||||||
#############################################
|
|
||||||
|
|
||||||
# the default profile
|
|
||||||
# profile=base
|
|
||||||
|
|
||||||
# the dist release; default: auto
|
|
||||||
# dist_release=rolling
|
|
||||||
|
|
||||||
# the branding; default: auto
|
|
||||||
# dist_branding="ARTIX"
|
|
||||||
|
|
||||||
# possible values: openrc, (s6, runit) not yet supported
|
|
||||||
# initsys="openrc"
|
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
# kernel="linux-lts"
|
|
||||||
|
|
||||||
# gpg key; leave empty or commented to skip sfs signing
|
|
||||||
# gpgkey=""
|
|
||||||
|
|
||||||
# set upload bandwidth limit in kB/s
|
|
||||||
# limit=100
|
|
||||||
|
|
||||||
# the torrent tracker urls, comma separated
|
|
||||||
# tracker_url='udp://mirror.strits.dk:6969'
|
|
||||||
|
|
||||||
# Piece size, 2^n
|
# Piece size, 2^n
|
||||||
# piece_size=21
|
# piece_size=21
|
||||||
|
|
||||||
|
@@ -6,4 +6,3 @@ artix-live-portable-efi
|
|||||||
virtualbox-guest-modules-artix
|
virtualbox-guest-modules-artix
|
||||||
virtualbox-guest-utils
|
virtualbox-guest-utils
|
||||||
linux-lts-headers
|
linux-lts-headers
|
||||||
|
|
||||||
|
@@ -43,6 +43,7 @@ man-pages
|
|||||||
memtest86+
|
memtest86+
|
||||||
mkinitcpio-openswap
|
mkinitcpio-openswap
|
||||||
nano
|
nano
|
||||||
|
net-tools
|
||||||
ntfs-3g
|
ntfs-3g
|
||||||
>openrc acpid-openrc
|
>openrc acpid-openrc
|
||||||
>openrc cronie-openrc
|
>openrc cronie-openrc
|
||||||
@@ -58,6 +59,7 @@ ntfs-3g
|
|||||||
>openrc nfs-utils-openrc
|
>openrc nfs-utils-openrc
|
||||||
>openrc rsync-openrc
|
>openrc rsync-openrc
|
||||||
>openrc wpa_supplicant-openrc
|
>openrc wpa_supplicant-openrc
|
||||||
|
>openrc opentmpfiles
|
||||||
os-prober
|
os-prober
|
||||||
pacman
|
pacman
|
||||||
pciutils
|
pciutils
|
||||||
@@ -76,7 +78,7 @@ texinfo
|
|||||||
usbutils
|
usbutils
|
||||||
util-linux
|
util-linux
|
||||||
which
|
which
|
||||||
>x86_64 efibootmgr
|
efibootmgr
|
||||||
xfsprogs
|
xfsprogs
|
||||||
zd1211-firmware
|
zd1211-firmware
|
||||||
zsh
|
zsh
|
||||||
|
@@ -11,16 +11,18 @@
|
|||||||
# openrc_boot=('elogind')
|
# openrc_boot=('elogind')
|
||||||
# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
|
# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
|
||||||
|
|
||||||
# unset defaults to given values
|
# default values
|
||||||
# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
|
# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
|
||||||
|
|
||||||
|
# netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
|
||||||
|
|
||||||
################# live-session #################
|
################# live-session #################
|
||||||
|
|
||||||
# unset defaults to given value
|
# default value
|
||||||
# hostname="artix"
|
# hostname="artix"
|
||||||
|
|
||||||
# unset defaults to given value
|
# default value
|
||||||
# username="artix"
|
# username="artix"
|
||||||
|
|
||||||
# unset defaults to given value
|
# default value
|
||||||
# password="artix"
|
# password="artix"
|
||||||
|
@@ -1,6 +1,34 @@
|
|||||||
autoconf-archive
|
autoconf-archive
|
||||||
|
cmocka
|
||||||
confuse
|
confuse
|
||||||
|
dovecot
|
||||||
|
hub
|
||||||
|
hwinfo
|
||||||
|
jansson
|
||||||
libappindicator
|
libappindicator
|
||||||
|
libbson
|
||||||
|
libdbi
|
||||||
libdbusmenu
|
libdbusmenu
|
||||||
libftdi
|
libftdi
|
||||||
libindicator
|
libindicator
|
||||||
|
libmongoc
|
||||||
|
libnewt
|
||||||
|
libpgm
|
||||||
|
libreplaygain
|
||||||
|
libsass
|
||||||
|
libsodium
|
||||||
|
libx86emu
|
||||||
|
ninja
|
||||||
|
pigeonhole
|
||||||
|
portaudio
|
||||||
|
sassc
|
||||||
|
yaml-cpp
|
||||||
|
zeromq
|
||||||
|
acpi_call
|
||||||
|
r8168
|
||||||
|
tp_smapi
|
||||||
|
acpi_call-lts
|
||||||
|
r8168-lts
|
||||||
|
tp_smapi-lts
|
||||||
|
virtualbox
|
||||||
|
virtualbox-guest-iso
|
||||||
|
2
data/import.list.d/lib32.list
Normal file
2
data/import.list.d/lib32.list
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
lib32-fakeroot
|
||||||
|
lib32-libltdl
|
@@ -1,60 +1,37 @@
|
|||||||
acl
|
tzdata
|
||||||
archlinux-keyring
|
iana-etc
|
||||||
|
linux-api-headers
|
||||||
|
binutils
|
||||||
|
glibc
|
||||||
|
gcc
|
||||||
attr
|
attr
|
||||||
|
acl
|
||||||
|
ncurses
|
||||||
|
readline
|
||||||
|
bash
|
||||||
|
sed
|
||||||
|
diffutils
|
||||||
|
expat
|
||||||
|
db
|
||||||
|
lz4
|
||||||
|
lzo
|
||||||
|
bzip2
|
||||||
|
gmp
|
||||||
|
mpfr
|
||||||
|
m4
|
||||||
|
gdbm
|
||||||
|
xz
|
||||||
|
zlib
|
||||||
|
file
|
||||||
|
zstd
|
||||||
|
icu
|
||||||
|
perl
|
||||||
|
openssl
|
||||||
|
openssl-1.0
|
||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
b43-fwcutter
|
|
||||||
binutils
|
|
||||||
bison
|
|
||||||
bridge-utils
|
|
||||||
bzip2
|
|
||||||
ca-certificates
|
|
||||||
ca-certificates-cacert
|
|
||||||
coreutils
|
|
||||||
cracklib
|
|
||||||
curl
|
|
||||||
dash
|
dash
|
||||||
db
|
bison
|
||||||
dialog
|
|
||||||
diffutils
|
|
||||||
ding-libs
|
|
||||||
dnssec-anchors
|
|
||||||
dosfstools
|
|
||||||
e2fsprogs
|
|
||||||
ed
|
|
||||||
efibootmgr
|
|
||||||
efivar
|
|
||||||
elfutils
|
|
||||||
expat
|
|
||||||
fakeroot
|
|
||||||
file
|
|
||||||
findutils
|
|
||||||
flex
|
|
||||||
gawk
|
|
||||||
gcc
|
|
||||||
gdbm
|
|
||||||
gettext
|
|
||||||
glib2
|
|
||||||
gmp
|
|
||||||
gnutls
|
|
||||||
gpgme
|
|
||||||
grep
|
|
||||||
groff
|
|
||||||
gzip
|
|
||||||
hdparm
|
|
||||||
hwids
|
|
||||||
iana-etc
|
|
||||||
icu
|
|
||||||
ifenslave
|
|
||||||
iproute2
|
|
||||||
iputils
|
|
||||||
ipw2100-fw
|
|
||||||
ipw2200-fw
|
|
||||||
isdn4k-utils
|
|
||||||
iw
|
|
||||||
jfsutils
|
|
||||||
kbd
|
|
||||||
keyutils
|
|
||||||
ldns
|
ldns
|
||||||
less
|
less
|
||||||
libaio
|
libaio
|
||||||
@@ -68,6 +45,7 @@ libgcrypt
|
|||||||
libgpg-error
|
libgpg-error
|
||||||
libgssglue
|
libgssglue
|
||||||
libidn
|
libidn
|
||||||
|
libidn2
|
||||||
libksba
|
libksba
|
||||||
libmnl
|
libmnl
|
||||||
libmpc
|
libmpc
|
||||||
@@ -77,6 +55,7 @@ libnl
|
|||||||
libpcap
|
libpcap
|
||||||
libpipeline
|
libpipeline
|
||||||
libpsl
|
libpsl
|
||||||
|
libidn2
|
||||||
librpcsecgss
|
librpcsecgss
|
||||||
libseccomp
|
libseccomp
|
||||||
libsecret
|
libsecret
|
||||||
@@ -85,19 +64,49 @@ libtasn1
|
|||||||
libtirpc
|
libtirpc
|
||||||
libtool
|
libtool
|
||||||
libunistring
|
libunistring
|
||||||
licenses
|
pcre
|
||||||
|
glib2
|
||||||
|
grep
|
||||||
|
gzip
|
||||||
|
bridge-utils
|
||||||
|
ca-certificates
|
||||||
|
ca-certificates-cacert
|
||||||
|
coreutils
|
||||||
|
cracklib
|
||||||
|
dialog
|
||||||
|
ding-libs
|
||||||
|
dnssec-anchors
|
||||||
|
dosfstools
|
||||||
|
e2fsprogs
|
||||||
|
ed
|
||||||
|
efibootmgr
|
||||||
|
efivar
|
||||||
|
elfutils
|
||||||
|
fakeroot
|
||||||
|
findutils
|
||||||
|
flex
|
||||||
|
gawk
|
||||||
|
gettext
|
||||||
|
gnutls
|
||||||
|
gpgme
|
||||||
|
groff
|
||||||
|
hdparm
|
||||||
|
hwids
|
||||||
|
ifenslave
|
||||||
|
iproute2
|
||||||
|
iputils
|
||||||
|
iw
|
||||||
|
jfsutils
|
||||||
|
kbd
|
||||||
|
keyutils
|
||||||
|
#licenses
|
||||||
links
|
links
|
||||||
linux-api-headers
|
|
||||||
linux-atm
|
linux-atm
|
||||||
linux-firmware
|
linux-firmware
|
||||||
lz4
|
|
||||||
lzo
|
|
||||||
m4
|
|
||||||
make
|
make
|
||||||
man-pages
|
man-pages
|
||||||
mkinitcpio-busybox
|
mkinitcpio-busybox
|
||||||
mkinitcpio-nfs-utils
|
mkinitcpio-nfs-utils
|
||||||
mpfr
|
|
||||||
nano
|
nano
|
||||||
nettle
|
nettle
|
||||||
net-tools
|
net-tools
|
||||||
@@ -106,13 +115,9 @@ nilfs-utils
|
|||||||
npth
|
npth
|
||||||
nspr
|
nspr
|
||||||
nss
|
nss
|
||||||
openssl
|
|
||||||
openssl-1.0
|
|
||||||
p11-kit
|
p11-kit
|
||||||
patch
|
patch
|
||||||
pciutils
|
pciutils
|
||||||
pcre
|
|
||||||
perl
|
|
||||||
pinentry
|
pinentry
|
||||||
pkcs11-helper
|
pkcs11-helper
|
||||||
pkg-config
|
pkg-config
|
||||||
@@ -124,8 +129,7 @@ pth
|
|||||||
reiserfsprogs
|
reiserfsprogs
|
||||||
run-parts
|
run-parts
|
||||||
sdparm
|
sdparm
|
||||||
sed
|
# s-nail
|
||||||
s-nail
|
|
||||||
sqlite
|
sqlite
|
||||||
sysfsutils
|
sysfsutils
|
||||||
syslinux
|
syslinux
|
||||||
@@ -133,7 +137,6 @@ tar
|
|||||||
texinfo
|
texinfo
|
||||||
thin-provisioning-tools
|
thin-provisioning-tools
|
||||||
traceroute
|
traceroute
|
||||||
tzdata
|
|
||||||
usbutils
|
usbutils
|
||||||
vi
|
vi
|
||||||
which
|
which
|
||||||
@@ -141,5 +144,12 @@ wireless-regdb
|
|||||||
wireless_tools
|
wireless_tools
|
||||||
wpa_actiond
|
wpa_actiond
|
||||||
xfsprogs
|
xfsprogs
|
||||||
xz
|
|
||||||
zd1211-firmware
|
zd1211-firmware
|
||||||
|
archlinux-keyring
|
||||||
|
b43-fwcutter
|
||||||
|
ipw2100-fw
|
||||||
|
ipw2200-fw
|
||||||
|
isdn4k-utils
|
||||||
|
curl
|
||||||
|
sudo
|
||||||
|
argon2
|
||||||
|
@@ -1,3 +1,379 @@
|
|||||||
|
a52dec
|
||||||
|
aalib
|
||||||
|
adwaita-icon-theme
|
||||||
|
alsa-firmware
|
||||||
|
alsa-lib
|
||||||
|
#alsa-utils
|
||||||
|
apr
|
||||||
|
apr-util
|
||||||
|
aspell
|
||||||
|
assimp
|
||||||
|
atk
|
||||||
|
at-spi2-atk
|
||||||
|
at-spi2-core
|
||||||
|
babl
|
||||||
|
bc
|
||||||
|
boost
|
||||||
|
brltty
|
||||||
|
cairo
|
||||||
|
cantarell-fonts
|
||||||
|
cdparanoia
|
||||||
|
check
|
||||||
|
cifs-utils
|
||||||
|
cln
|
||||||
|
cmake
|
||||||
|
extra-cmake-modules
|
||||||
|
compositeproto
|
||||||
|
convertlit
|
||||||
|
cpio
|
||||||
|
damageproto
|
||||||
|
dbus-glib
|
||||||
|
dbus-python
|
||||||
|
dcadec
|
||||||
|
dconf
|
||||||
|
desktop-file-utils
|
||||||
|
dkms
|
||||||
|
docbook-dsssl
|
||||||
|
docbook-sgml31
|
||||||
|
docbook-utils
|
||||||
|
docbook-xml
|
||||||
|
docbook-xsl
|
||||||
|
dotconf
|
||||||
|
double-conversion
|
||||||
|
doxygen
|
||||||
|
ebook-tools
|
||||||
|
editorconfig-core-c
|
||||||
|
exiv2
|
||||||
|
faad2
|
||||||
|
ffmpeg
|
||||||
|
ffmpeg2.8
|
||||||
|
fftw
|
||||||
|
fixesproto
|
||||||
|
flac
|
||||||
|
fontconfig
|
||||||
|
fontsproto
|
||||||
|
freetype2
|
||||||
|
fribidi
|
||||||
|
fuse2
|
||||||
|
fuse3
|
||||||
|
gamin
|
||||||
|
gc
|
||||||
|
gcab
|
||||||
|
gconf
|
||||||
|
gcr
|
||||||
|
gd
|
||||||
|
gdb
|
||||||
|
gdk-pixbuf2
|
||||||
|
gegl02
|
||||||
|
ghostscript
|
||||||
|
giblib
|
||||||
|
giflib
|
||||||
|
glade
|
||||||
|
glib-networking
|
||||||
|
glu
|
||||||
|
gnome-common
|
||||||
|
gobject-introspection
|
||||||
|
gperf
|
||||||
|
gperftools
|
||||||
|
gptfdisk
|
||||||
|
grantlee
|
||||||
|
graphite
|
||||||
|
graphviz
|
||||||
|
gsettings-desktop-schemas
|
||||||
|
gsfonts
|
||||||
|
gsm
|
||||||
|
gst-plugins-base
|
||||||
|
gst-plugins-good
|
||||||
|
gstreamer
|
||||||
|
gtk2
|
||||||
|
gtk3
|
||||||
|
gtk-doc
|
||||||
|
gtksourceview3
|
||||||
|
gts
|
||||||
|
guile
|
||||||
|
guile2.0
|
||||||
|
harfbuzz
|
||||||
|
hicolor-icon-theme
|
||||||
|
hunspell
|
||||||
|
hyphen
|
||||||
|
ijs
|
||||||
|
ilmbase
|
||||||
|
imagemagick
|
||||||
|
imlib2
|
||||||
|
iniparser
|
||||||
|
inputproto
|
||||||
|
intltool
|
||||||
|
iso-codes
|
||||||
|
itstool
|
||||||
|
jack
|
||||||
|
jasper
|
||||||
|
java8-openjdk
|
||||||
|
java-common
|
||||||
|
jbig2dec
|
||||||
|
jemalloc
|
||||||
|
js
|
||||||
|
# json-c
|
||||||
|
jsoncpp
|
||||||
|
json-glib
|
||||||
|
kbproto
|
||||||
|
lame
|
||||||
|
lapack
|
||||||
|
lcms
|
||||||
|
lcms2
|
||||||
|
ldb
|
||||||
|
libaccounts-glib
|
||||||
|
libaccounts-qt
|
||||||
|
libao
|
||||||
|
libass
|
||||||
|
libasyncns
|
||||||
|
libatomic_ops
|
||||||
|
libavc1394
|
||||||
|
libbluray
|
||||||
|
libbsd
|
||||||
|
libburn
|
||||||
|
libbytesize
|
||||||
|
libcaca
|
||||||
|
libcanberra
|
||||||
|
libcap-ng
|
||||||
|
libcddb
|
||||||
|
libcdio
|
||||||
|
libcdio-paranoia
|
||||||
|
# libconfig
|
||||||
|
libcroco
|
||||||
|
libcue
|
||||||
|
libdaemon
|
||||||
|
libdatrie
|
||||||
|
libdbusmenu-qt
|
||||||
|
libdca
|
||||||
|
libdmtx
|
||||||
|
libdrm
|
||||||
|
libdv
|
||||||
|
libdvbpsi
|
||||||
|
libdvdcss
|
||||||
|
libdvdnav
|
||||||
|
libdvdread
|
||||||
|
libebml
|
||||||
|
libepoxy
|
||||||
|
libevdev
|
||||||
|
libexif
|
||||||
|
libfontenc
|
||||||
|
libgee
|
||||||
|
libgit2
|
||||||
|
libglade
|
||||||
|
libglvnd
|
||||||
|
libgphoto2
|
||||||
|
libgusb
|
||||||
|
libical
|
||||||
|
libice
|
||||||
|
libid3tag
|
||||||
|
libiec61883
|
||||||
|
libieee1284
|
||||||
|
libimobiledevice
|
||||||
|
libiscsi
|
||||||
|
libisoburn
|
||||||
|
libisofs
|
||||||
|
libjpeg-turbo
|
||||||
|
liblouis
|
||||||
|
liblqr
|
||||||
|
libmad
|
||||||
|
libmatroska
|
||||||
|
libmng
|
||||||
|
libmodplug
|
||||||
|
libmpeg2
|
||||||
|
libmspack
|
||||||
|
libmtp
|
||||||
|
libndp
|
||||||
|
libnotify
|
||||||
|
# libogg
|
||||||
|
libomxil-bellagio
|
||||||
|
libpaper
|
||||||
|
libpciaccess
|
||||||
|
libplist
|
||||||
|
libpng
|
||||||
|
libproxy
|
||||||
|
libpwquality
|
||||||
|
libqalculate
|
||||||
|
libqmi
|
||||||
|
libraqm
|
||||||
|
# libraw1394
|
||||||
|
librsvg
|
||||||
|
libsamplerate
|
||||||
|
libshout
|
||||||
|
libsigc++
|
||||||
|
libsigsegv
|
||||||
|
libsm
|
||||||
|
# libsndfile
|
||||||
|
libsoup
|
||||||
|
libsoxr
|
||||||
|
libspiro
|
||||||
|
libsrtp
|
||||||
|
libssh
|
||||||
|
libtar
|
||||||
|
# libthai
|
||||||
|
libtheora
|
||||||
|
libtiff
|
||||||
|
libtommath
|
||||||
|
libtxc_dxtn
|
||||||
|
libunwind
|
||||||
|
libupnp
|
||||||
|
libusb-compat
|
||||||
|
libusbmuxd
|
||||||
|
libutempter
|
||||||
|
libuv
|
||||||
|
libva
|
||||||
|
libvdpau
|
||||||
|
libvisual
|
||||||
|
libvorbis
|
||||||
|
libvpx
|
||||||
|
libwebp
|
||||||
|
libwmf
|
||||||
|
libx11
|
||||||
|
# libxau
|
||||||
|
libxaw
|
||||||
|
# libxcb
|
||||||
|
libxcomposite
|
||||||
|
libxcursor
|
||||||
|
libxdamage
|
||||||
|
# libxdmcp
|
||||||
|
libxext
|
||||||
|
libxfixes
|
||||||
|
libxfont2
|
||||||
|
libxft
|
||||||
|
libxi
|
||||||
|
libxinerama
|
||||||
|
libxkbcommon
|
||||||
|
libxkbfile
|
||||||
|
libxml2
|
||||||
|
libxmu
|
||||||
|
libxpm
|
||||||
|
libxrandr
|
||||||
|
libxrender
|
||||||
|
libxres
|
||||||
|
libxshmfence
|
||||||
|
libxslt
|
||||||
|
libxss
|
||||||
|
libxt
|
||||||
|
libxtst
|
||||||
|
libxv
|
||||||
|
libxvmc
|
||||||
|
libxxf86vm
|
||||||
|
libyaml
|
||||||
|
libzip
|
||||||
|
lirc
|
||||||
|
llvm
|
||||||
|
lmdb
|
||||||
|
lua
|
||||||
|
mesa
|
||||||
|
# meson
|
||||||
|
mailcap
|
||||||
|
mobile-broadband-provider-info
|
||||||
|
mtdev
|
||||||
|
muparser
|
||||||
|
musepack
|
||||||
|
namcap
|
||||||
|
nasm
|
||||||
|
network-manager-applet
|
||||||
|
noto-fonts
|
||||||
|
nss-mdns
|
||||||
|
ntfs-3g
|
||||||
|
# nvidia
|
||||||
|
# nvidia-settings
|
||||||
|
# nvidia-utils
|
||||||
|
ocl-icd
|
||||||
|
openal
|
||||||
|
opencore-amr
|
||||||
|
openexr
|
||||||
|
openjade
|
||||||
|
openjpeg
|
||||||
|
openjpeg2
|
||||||
|
opensp
|
||||||
|
opus
|
||||||
|
orc
|
||||||
|
orca
|
||||||
|
pango
|
||||||
|
parted
|
||||||
|
pcre2
|
||||||
|
perl-error
|
||||||
|
perl-file-which
|
||||||
|
perl-xml-parser
|
||||||
|
perl-yaml
|
||||||
|
phonon
|
||||||
|
phonon-gstreamer
|
||||||
|
pixman
|
||||||
|
polkit-qt
|
||||||
|
poppler
|
||||||
|
potrace
|
||||||
|
protobuf
|
||||||
|
pyalpm
|
||||||
|
pygobject
|
||||||
|
pygtk
|
||||||
|
# pylint
|
||||||
|
pyqt5
|
||||||
|
python
|
||||||
|
python2
|
||||||
|
# python2-backports
|
||||||
|
# python2-backports.functools_lru_cache
|
||||||
|
# python2-configparser
|
||||||
|
# python2-ipaddress
|
||||||
|
python-appdirs
|
||||||
|
python-asn1crypto
|
||||||
|
# python-astroid
|
||||||
|
python-attrs
|
||||||
|
# python-automat
|
||||||
|
python-beaker
|
||||||
|
python-cairo
|
||||||
|
# python-cffi
|
||||||
|
python-chardet
|
||||||
|
# python-constantly
|
||||||
|
# python-cryptography
|
||||||
|
python-cssselect
|
||||||
|
python-defusedxml
|
||||||
|
# python-editdistance
|
||||||
|
# python-egenix-mx-base
|
||||||
|
python-evdev
|
||||||
|
# python-feedparser
|
||||||
|
# python-fpconst
|
||||||
|
# python-gdata
|
||||||
|
# python-geoip
|
||||||
|
python-hyperlink
|
||||||
|
python-idna
|
||||||
|
# python-incremental
|
||||||
|
# python-isort
|
||||||
|
# python-iwscan
|
||||||
|
# python-lazy-object-proxy
|
||||||
|
# python-lxml
|
||||||
|
python-mako
|
||||||
|
python-markupsafe
|
||||||
|
# python-mccabe
|
||||||
|
# python-mpd
|
||||||
|
# python-nose
|
||||||
|
python-notify
|
||||||
|
python-numpy
|
||||||
|
python-packaging
|
||||||
|
python-pip
|
||||||
|
python-ply
|
||||||
|
python-pyasn1
|
||||||
|
# python-pyasn1-modules
|
||||||
|
# python-pycparser
|
||||||
|
# python-pycurl
|
||||||
|
python-pyelftools
|
||||||
|
# python-pygame
|
||||||
|
python-pyparsing
|
||||||
|
# python-rdflib
|
||||||
|
# python-requests
|
||||||
|
# python-retrying
|
||||||
|
# python-service-identity
|
||||||
|
python-setuptools
|
||||||
|
python-six
|
||||||
|
# python-soappy
|
||||||
|
# python-telepathy
|
||||||
|
# python-urllib3
|
||||||
|
python-urwid
|
||||||
|
python-virtualenv
|
||||||
|
# python-wpactrl
|
||||||
|
python-wrapt
|
||||||
|
# python-wstools
|
||||||
|
pyxdg
|
||||||
qt5-3d
|
qt5-3d
|
||||||
qt5-canvas3d
|
qt5-canvas3d
|
||||||
qt5-charts
|
qt5-charts
|
||||||
@@ -33,180 +409,117 @@ qt5-websockets
|
|||||||
qt5-webview
|
qt5-webview
|
||||||
qt5-x11extras
|
qt5-x11extras
|
||||||
qt5-xmlpatterns
|
qt5-xmlpatterns
|
||||||
adwaita-icon-theme
|
|
||||||
alsa-lib
|
|
||||||
apr
|
|
||||||
apr-util
|
|
||||||
atk
|
|
||||||
at-spi2-atk
|
|
||||||
at-spi2-core
|
|
||||||
boost
|
|
||||||
cairo
|
|
||||||
cantarell-fonts
|
|
||||||
check
|
|
||||||
compositeproto
|
|
||||||
damageproto
|
|
||||||
dbus-glib
|
|
||||||
dconf
|
|
||||||
desktop-file-utils
|
|
||||||
docbook-dsssl
|
|
||||||
docbook-sgml31
|
|
||||||
docbook-utils
|
|
||||||
docbook-xml
|
|
||||||
docbook-xsl
|
|
||||||
double-conversion
|
|
||||||
doxygen
|
|
||||||
eventlog
|
|
||||||
fixesproto
|
|
||||||
fontconfig
|
|
||||||
fontsproto
|
|
||||||
freetype2
|
|
||||||
gd
|
|
||||||
gdk-pixbuf2
|
|
||||||
ghostscript
|
|
||||||
giflib
|
|
||||||
gnome-common
|
|
||||||
gobject-introspection
|
|
||||||
gptfdisk
|
|
||||||
graphite
|
|
||||||
graphviz
|
|
||||||
gsfonts
|
|
||||||
gtk3
|
|
||||||
gtk-doc
|
|
||||||
gts
|
|
||||||
harfbuzz
|
|
||||||
hicolor-icon-theme
|
|
||||||
ijs
|
|
||||||
inputproto
|
|
||||||
intltool
|
|
||||||
itstool
|
|
||||||
jasper
|
|
||||||
jbig2dec
|
|
||||||
json-glib
|
|
||||||
kbproto
|
|
||||||
lcms2
|
|
||||||
libasyncns
|
|
||||||
libblockdev
|
|
||||||
libbytesize
|
|
||||||
libcap-ng
|
|
||||||
libcroco
|
|
||||||
libdaemon
|
|
||||||
libdatrie
|
|
||||||
libdrm
|
|
||||||
libepoxy
|
|
||||||
libexif
|
|
||||||
libfontenc
|
|
||||||
libglvnd
|
|
||||||
libgphoto2
|
|
||||||
libical
|
|
||||||
libice
|
|
||||||
libieee1284
|
|
||||||
libimobiledevice
|
|
||||||
libiscsi
|
|
||||||
libjpeg-turbo
|
|
||||||
libomxil-bellagio
|
|
||||||
libpaper
|
|
||||||
libpciaccess
|
|
||||||
libplist
|
|
||||||
libpng
|
|
||||||
libproxy
|
|
||||||
librsvg
|
|
||||||
libsm
|
|
||||||
libthai
|
|
||||||
libtiff
|
|
||||||
libtxc_dxtn
|
|
||||||
libunwind
|
|
||||||
libusb-compat
|
|
||||||
libusbmuxd
|
|
||||||
libwebp
|
|
||||||
libx11
|
|
||||||
libxau
|
|
||||||
libxaw
|
|
||||||
libxcb
|
|
||||||
libxcomposite
|
|
||||||
libxcursor
|
|
||||||
libxdamage
|
|
||||||
libxdmcp
|
|
||||||
libxext
|
|
||||||
libxfixes
|
|
||||||
libxfont
|
|
||||||
libxfont2
|
|
||||||
libxft
|
|
||||||
libxi
|
|
||||||
libxinerama
|
|
||||||
libxkbcommon
|
|
||||||
libxkbfile
|
|
||||||
libxml2
|
|
||||||
libxmu
|
|
||||||
libxpm
|
|
||||||
libxrandr
|
|
||||||
libxrender
|
|
||||||
libxshmfence
|
|
||||||
libxslt
|
|
||||||
libxt
|
|
||||||
libxtst
|
|
||||||
libxxf86vm
|
|
||||||
lirc
|
|
||||||
llvm
|
|
||||||
mesa
|
|
||||||
mtdev
|
|
||||||
net-snmp
|
|
||||||
openjade
|
|
||||||
opensp
|
|
||||||
pango
|
|
||||||
parted
|
|
||||||
pcre2
|
|
||||||
perl-error
|
|
||||||
perl-xml-parser
|
|
||||||
perl-yaml
|
|
||||||
pixman
|
|
||||||
python2
|
|
||||||
python
|
|
||||||
python-appdirs
|
|
||||||
python-beaker
|
|
||||||
python-mako
|
|
||||||
python-markupsafe
|
|
||||||
python-packaging
|
|
||||||
python-pyparsing
|
|
||||||
python-setuptools
|
|
||||||
python-six
|
|
||||||
randrproto
|
randrproto
|
||||||
recordproto
|
recordproto
|
||||||
renderproto
|
renderproto
|
||||||
|
ruby
|
||||||
|
schroedinger
|
||||||
|
scrnsaverproto
|
||||||
|
sdl
|
||||||
|
sdl2
|
||||||
|
sdl_image
|
||||||
|
sdl_sound
|
||||||
serf
|
serf
|
||||||
sgml-common
|
sgml-common
|
||||||
shared-mime-info
|
shared-mime-info
|
||||||
|
slang
|
||||||
|
snappy
|
||||||
|
snowball
|
||||||
|
socat
|
||||||
source-highlight
|
source-highlight
|
||||||
|
speech-dispatcher
|
||||||
|
speex
|
||||||
speexdsp
|
speexdsp
|
||||||
|
startup-notification
|
||||||
|
t1lib
|
||||||
|
taglib
|
||||||
|
talloc
|
||||||
|
tcl
|
||||||
|
tdb
|
||||||
|
tevent
|
||||||
|
texlive-bin
|
||||||
|
texlive-core
|
||||||
|
texlive-formatsextra
|
||||||
|
texlive-latexextra
|
||||||
|
texlive-pictures
|
||||||
|
texlive-science
|
||||||
tslib
|
tslib
|
||||||
|
ttf-bitstream-vera
|
||||||
|
ttf-dejavu
|
||||||
|
ttf-hack
|
||||||
|
ttf-indic-otf
|
||||||
|
unixodbc
|
||||||
|
unzip
|
||||||
|
#usbmuxd
|
||||||
v4l-utils
|
v4l-utils
|
||||||
vala
|
vala
|
||||||
valgrind
|
valgrind
|
||||||
|
videoproto
|
||||||
|
vid.stab
|
||||||
volume_key
|
volume_key
|
||||||
vte3
|
|
||||||
vte
|
vte
|
||||||
|
vte3
|
||||||
|
wavpack
|
||||||
wayland
|
wayland
|
||||||
wayland-protocols
|
wayland-protocols
|
||||||
xcb-proto
|
webrtc-audio-processing
|
||||||
xcb-util
|
wget
|
||||||
xcb-util-image
|
whois
|
||||||
xcb-util-keysyms
|
wxgtk
|
||||||
xcb-util-renderutil
|
x265
|
||||||
xcb-util-wm
|
xapian-core
|
||||||
|
xbitmaps
|
||||||
|
# xcb-proto
|
||||||
|
# xcb-util
|
||||||
|
xcb-util-cursor
|
||||||
|
# xcb-util-image
|
||||||
|
# xcb-util-keysyms
|
||||||
|
# xcb-util-renderutil
|
||||||
|
# xcb-util-wm
|
||||||
|
xdg-utils
|
||||||
xextproto
|
xextproto
|
||||||
|
xf86-input-libinput
|
||||||
|
xf86-video-dummy
|
||||||
|
xf86-video-fbdev
|
||||||
|
xf86-video-sisusb
|
||||||
|
xf86-video-vesa
|
||||||
|
xf86-video-vmware
|
||||||
|
xf86-video-voodoo
|
||||||
xf86vidmodeproto
|
xf86vidmodeproto
|
||||||
xineramaproto
|
xineramaproto
|
||||||
xkeyboard-config
|
xkeyboard-config
|
||||||
|
xmlto
|
||||||
xorg-bdftopcf
|
xorg-bdftopcf
|
||||||
xorg-fonts-alias
|
xorg-fonts-alias
|
||||||
xorg-fonts-encodings
|
xorg-fonts-encodings
|
||||||
xorg-fonts-misc
|
xorg-fonts-misc
|
||||||
xorg-font-util
|
xorg-font-util
|
||||||
xorg-font-utils
|
xorg-font-utils
|
||||||
|
xorg-luit
|
||||||
xorg-mkfontdir
|
xorg-mkfontdir
|
||||||
xorg-mkfontscale
|
xorg-mkfontscale
|
||||||
xorg-setxkbmap
|
xorg-setxkbmap
|
||||||
|
xorg-twm
|
||||||
|
xorg-util-macros
|
||||||
|
xorg-xauth
|
||||||
|
xorg-xinit
|
||||||
xorg-xkbcomp
|
xorg-xkbcomp
|
||||||
xproto
|
xorg-xmessage
|
||||||
|
xorg-xmodmap
|
||||||
|
xorg-xprop
|
||||||
|
xorg-xrandr
|
||||||
|
xorg-xrdb
|
||||||
|
xorg-xset
|
||||||
|
xorg-xsetroot
|
||||||
|
# xproto
|
||||||
|
xterm
|
||||||
|
xvidcore
|
||||||
|
yajl
|
||||||
yelp-tools
|
yelp-tools
|
||||||
yelp-xsl
|
yelp-xsl
|
||||||
|
zip
|
||||||
|
zita-alsa-pcmi
|
||||||
|
zita-resampler
|
||||||
|
zsh
|
||||||
|
zvbi
|
||||||
|
zziplib
|
||||||
|
@@ -1,14 +0,0 @@
|
|||||||
# mkinitcpio preset file for the 'linux' package
|
|
||||||
|
|
||||||
ALL_config="/etc/mkinitcpio.conf"
|
|
||||||
ALL_kver="/boot/vmlinuz-@kernel@-@arch@"
|
|
||||||
|
|
||||||
PRESETS=('default' 'fallback')
|
|
||||||
|
|
||||||
#default_config="/etc/mkinitcpio.conf"
|
|
||||||
default_image="/boot/initramfs-@kernel@-@arch@.img"
|
|
||||||
#default_options=""
|
|
||||||
|
|
||||||
#fallback_config="/etc/mkinitcpio.conf"
|
|
||||||
fallback_image="/boot/initramfs-@kernel@-@arch@-fallback.img"
|
|
||||||
fallback_options="-S autodetect"
|
|
@@ -1,3 +0,0 @@
|
|||||||
carch="i686"
|
|
||||||
chost="i686-pc-linux-gnu"
|
|
||||||
cflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
|
@@ -1,3 +0,0 @@
|
|||||||
carch="x86_64"
|
|
||||||
chost="x86_64-pc-linux-gnu"
|
|
||||||
cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
|
@@ -1,3 +0,0 @@
|
|||||||
carch="x86_64"
|
|
||||||
chost="x86_64-pc-linux-gnu"
|
|
||||||
cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
|
@@ -20,26 +20,26 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %
|
|||||||
# /usr/bin/wget
|
# /usr/bin/wget
|
||||||
|
|
||||||
#-- The package required by makepkg to download VCS sources
|
#-- The package required by makepkg to download VCS sources
|
||||||
# Format: 'protocol::package'
|
# Format: 'protocol::package'
|
||||||
VCSCLIENTS=('bzr::bzr'
|
VCSCLIENTS=('bzr::bzr'
|
||||||
'git::git'
|
'git::git'
|
||||||
'hg::mercurial'
|
'hg::mercurial'
|
||||||
'svn::subversion')
|
'svn::subversion')
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
# ARCHITECTURE, COMPILE FLAGS
|
# ARCHITECTURE, COMPILE FLAGS
|
||||||
#########################################################################
|
#########################################################################
|
||||||
#
|
#
|
||||||
CARCH="@CARCH@"
|
CARCH="x86_64"
|
||||||
CHOST="@CHOST@"
|
CHOST="x86_64-pc-linux-gnu"
|
||||||
|
|
||||||
#-- Compiler and Linker Flags
|
#-- Compiler and Linker Flags
|
||||||
# -march (or -mcpu) builds exclusively for an architecture
|
# -march (or -mcpu) builds exclusively for an architecture
|
||||||
# -mtune optimizes for an architecture, but builds for whole processor family
|
# -mtune optimizes for an architecture, but builds for whole processor family
|
||||||
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
||||||
CFLAGS="@CFLAGS@"
|
CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
||||||
CXXFLAGS="@CFLAGS@"
|
CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
||||||
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
|
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
|
||||||
#-- Make Flags: change this for DistCC/SMP systems
|
#-- Make Flags: change this for DistCC/SMP systems
|
||||||
#MAKEFLAGS="-j2"
|
#MAKEFLAGS="-j2"
|
||||||
#-- Debugging flags
|
#-- Debugging flags
|
||||||
@@ -50,10 +50,9 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
|
|||||||
# BUILD ENVIRONMENT
|
# BUILD ENVIRONMENT
|
||||||
#########################################################################
|
#########################################################################
|
||||||
#
|
#
|
||||||
# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
|
# Defaults: BUILDENV=(!distcc color !ccache check !sign)
|
||||||
# A negated environment option will do the opposite of the comments below.
|
# A negated environment option will do the opposite of the comments below.
|
||||||
#
|
#
|
||||||
#-- fakeroot: Allow building packages as a non-root user
|
|
||||||
#-- distcc: Use the Distributed C/C++/ObjC compiler
|
#-- distcc: Use the Distributed C/C++/ObjC compiler
|
||||||
#-- color: Colorize output messages
|
#-- color: Colorize output messages
|
||||||
#-- ccache: Use ccache to cache compilation
|
#-- ccache: Use ccache to cache compilation
|
||||||
@@ -85,6 +84,7 @@ BUILDENV=(!distcc color !ccache check !sign)
|
|||||||
#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
|
#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
|
||||||
#-- purge: Remove files specified by PURGE_TARGETS
|
#-- purge: Remove files specified by PURGE_TARGETS
|
||||||
#-- upx: Compress binary executable files using UPX
|
#-- upx: Compress binary executable files using UPX
|
||||||
|
#-- optipng: Optimize PNG images with optipng
|
||||||
#-- debug: Add debugging flags as specified in DEBUG_* variables
|
#-- debug: Add debugging flags as specified in DEBUG_* variables
|
||||||
#
|
#
|
||||||
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
|
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
|
||||||
|
@@ -1,3 +1,5 @@
|
|||||||
MODULES="loop dm-snapshot"
|
MODULES=(loop dm-snapshot)
|
||||||
HOOKS="base udev artix_shutdown artix artix_loop_mnt artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs artix_kms modconf block pcmcia filesystems keyboard keymap"
|
|
||||||
|
HOOKS=(base udev artix_shutdown artix artix_loop_mnt artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs artix_kms modconf block pcmcia filesystems keyboard keymap)
|
||||||
|
|
||||||
COMPRESSION="xz"
|
COMPRESSION="xz"
|
||||||
|
@@ -64,26 +64,53 @@ LocalFileSigLevel = Optional
|
|||||||
# The header [repo-name] is crucial - it must be present and
|
# The header [repo-name] is crucial - it must be present and
|
||||||
# uncommented to enable the repo.
|
# uncommented to enable the repo.
|
||||||
|
|
||||||
|
[system-testing]
|
||||||
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[system]
|
[system]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
[world-testing]
|
||||||
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[world]
|
[world]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
[galaxy-testing]
|
||||||
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[galaxy]
|
[galaxy]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
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-testing]
|
||||||
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
[lib32]
|
||||||
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
# An example of a custom package repository. See the pacman manpage for
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
# tips on creating your own repositories.
|
# tips on creating your own repositories.
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
# [core]
|
[testing]
|
||||||
# Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
[extra]
|
[extra]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
[community-testing]
|
||||||
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
[community]
|
[community]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
[multilib-testing]
|
||||||
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
[multilib]
|
||||||
|
Include = /etc/pacman.d/mirrorlist-arch
|
@@ -74,10 +74,10 @@ Include = /etc/pacman.d/mirrorlist
|
|||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
# If you want to run 32 bit applications on your x86_64 system,
|
# If you want to run 32 bit applications on your x86_64 system,
|
||||||
# enable the multilib repositories as required here.
|
# enable the lib32 repositories as required here.
|
||||||
|
|
||||||
[multilib]
|
[lib32]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
# An example of a custom package repository. See the pacman manpage for
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
# tips on creating your own repositories.
|
# tips on creating your own repositories.
|
||||||
@@ -85,11 +85,11 @@ Include = /etc/pacman.d/mirrorlist-arch
|
|||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
# [core]
|
|
||||||
# Include = /etc/pacman.d/mirrorlist-arch
|
|
||||||
|
|
||||||
[extra]
|
[extra]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
[community]
|
[community]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
[multilib]
|
||||||
|
Include = /etc/pacman.d/mirrorlist-arch
|
49
data/patches/artix-bashrc.patch
Normal file
49
data/patches/artix-bashrc.patch
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
--- /dev/null
|
||||||
|
+++ b/bash/artix.bashrc
|
||||||
|
@@ -0,0 +1,46 @@
|
||||||
|
+use_color=true
|
||||||
|
+
|
||||||
|
+# Set colorful PS1 only on colorful terminals.
|
||||||
|
+# dircolors --print-database uses its own built-in database
|
||||||
|
+# instead of using /etc/DIR_COLORS. Try to use the external file
|
||||||
|
+# first to take advantage of user additions. Use internal bash
|
||||||
|
+# globbing instead of external grep binary.
|
||||||
|
+safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
|
||||||
|
+match_lhs=""
|
||||||
|
+[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
|
||||||
|
+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
|
||||||
|
+[[ -z ${match_lhs} ]] \
|
||||||
|
+ && type -P dircolors >/dev/null \
|
||||||
|
+ && match_lhs=$(dircolors --print-database)
|
||||||
|
+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
|
||||||
|
+
|
||||||
|
+if ${use_color} ; then
|
||||||
|
+ # Enable colors for ls, etc. Prefer ~/.dir_colors #64489
|
||||||
|
+ if type -P dircolors >/dev/null ; then
|
||||||
|
+ if [[ -f ~/.dir_colors ]] ; then
|
||||||
|
+ eval $(dircolors -b ~/.dir_colors)
|
||||||
|
+ elif [[ -f /etc/DIR_COLORS ]] ; then
|
||||||
|
+ eval $(dircolors -b /etc/DIR_COLORS)
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [[ ${EUID} == 0 ]] ; then
|
||||||
|
+ PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] '
|
||||||
|
+ else
|
||||||
|
+ PS1='\[\033[01;36m\][\u@\h\[\033[01;37m\] \W\[\033[01;36m\]]\$\[\033[00m\] '
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ alias ls='ls --color=auto'
|
||||||
|
+ alias grep='grep --colour=auto'
|
||||||
|
+ alias egrep='egrep --colour=auto'
|
||||||
|
+ alias fgrep='fgrep --colour=auto'
|
||||||
|
+else
|
||||||
|
+ if [[ ${EUID} == 0 ]] ; then
|
||||||
|
+ # show root@ when we don't have colors
|
||||||
|
+ PS1='\u@\h \W \$ '
|
||||||
|
+ else
|
||||||
|
+ PS1='\u@\h \w \$ '
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+unset use_color safe_term match_lhs sh
|
11
data/patches/dot-bashrc.patch
Normal file
11
data/patches/dot-bashrc.patch
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/bash/dot.bashrc
|
||||||
|
+++ b/bash/dot.bashrc
|
||||||
|
@@ -5,5 +5,5 @@
|
||||||
|
# If not running interactively, don't do anything
|
||||||
|
[[ $- != *i* ]] && return
|
||||||
|
|
||||||
|
-alias ls='ls --color=auto'
|
||||||
|
-PS1='[\u@\h \W]\$ '
|
||||||
|
+# alias ls='ls --color=auto'
|
||||||
|
+# PS1='[\u@\h \W]\$ '
|
||||||
|
|
19
data/patches/system-bashrc.patch
Normal file
19
data/patches/system-bashrc.patch
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
--- a/bash/system.bashrc
|
||||||
|
+++ a/bash/system.bashrc
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
#
|
||||||
|
-# /etc/bash.bashrc
|
||||||
|
+# /etc/bash/bashrc
|
||||||
|
#
|
||||||
|
|
||||||
|
# If not running interactively, don't do anything
|
||||||
|
@@ -19,4 +19,8 @@
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
+for sh in /etc/bash/bashrc.d/*.bashrc ; do
|
||||||
|
+ [[ -r ${sh} ]] && source "${sh}"
|
||||||
|
+done
|
||||||
|
+
|
||||||
|
[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
|
||||||
|
|
8
data/patches/system-bashrc_logout.patch
Normal file
8
data/patches/system-bashrc_logout.patch
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
--- a/bash/system.bash_logout
|
||||||
|
+++ a/bash/system.bash_logout
|
||||||
|
@@ -1,3 +1,3 @@
|
||||||
|
#
|
||||||
|
-# /etc/bash.bash_logout
|
||||||
|
+# /etc/bash/bash_logout
|
||||||
|
#
|
||||||
|
|
@@ -1,30 +0,0 @@
|
|||||||
##########################################
|
|
||||||
###### use this file in the profile ######
|
|
||||||
##########################################
|
|
||||||
|
|
||||||
################ install ################
|
|
||||||
|
|
||||||
# default displaymanager: none
|
|
||||||
# supported; lightdm, sddm, gdm, lxdm, mdm
|
|
||||||
# displaymanager="none"
|
|
||||||
|
|
||||||
# Set to false to disable autologin in the livecd
|
|
||||||
# autologin="true"
|
|
||||||
|
|
||||||
# service runlevels
|
|
||||||
# openrc_boot=('elogind')
|
|
||||||
# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
|
|
||||||
|
|
||||||
# unset defaults to given values
|
|
||||||
# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
|
|
||||||
|
|
||||||
################# live-session #################
|
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
# hostname="artix"
|
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
# username="artix"
|
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
# password="artix"
|
|
@@ -1 +0,0 @@
|
|||||||
0.5
|
|
@@ -102,7 +102,7 @@ _mnt_dev() {
|
|||||||
_verify_checksum() {
|
_verify_checksum() {
|
||||||
local _status
|
local _status
|
||||||
cd "/run/artix/bootmnt/${artixbasedir}/${arch}"
|
cd "/run/artix/bootmnt/${artixbasedir}/${arch}"
|
||||||
md5sum -c $1.md5 > /tmp/checksum.log 2>&1
|
sha512sum -c $1.sha512 > /tmp/checksum.log 2>&1
|
||||||
_status=$?
|
_status=$?
|
||||||
cd "${OLDPWD}"
|
cd "${OLDPWD}"
|
||||||
return ${_status}
|
return ${_status}
|
||||||
@@ -120,7 +120,7 @@ _verify_signature() {
|
|||||||
run_hook() {
|
run_hook() {
|
||||||
[[ -z "${arch}" ]] && arch="$(uname -m)"
|
[[ -z "${arch}" ]] && arch="$(uname -m)"
|
||||||
[[ -z "${copytoram_size}" ]] && copytoram_size="75%"
|
[[ -z "${copytoram_size}" ]] && copytoram_size="75%"
|
||||||
[[ -z "${artixbasedir}" ]] && artixbasedir="cromnix"
|
[[ -z "${artixbasedir}" ]] && artixbasedir="artix"
|
||||||
|
|
||||||
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
|
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
|
||||||
[[ -z "${artixdevice}" ]] && artixdevice="/dev/disk/by-label/${artixlabel}"
|
[[ -z "${artixdevice}" ]] && artixdevice="/dev/disk/by-label/${artixlabel}"
|
||||||
@@ -160,7 +160,7 @@ artix_mount_handler() {
|
|||||||
if [[ "${checksum}" == "y" ]]; then
|
if [[ "${checksum}" == "y" ]]; then
|
||||||
for fs in rootfs desktopfs livefs;do
|
for fs in rootfs desktopfs livefs;do
|
||||||
if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sfs" ]]; then
|
if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sfs" ]]; then
|
||||||
if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.md5" ]]; then
|
if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sha512" ]]; then
|
||||||
msg -n ":: Self-test requested, please wait..."
|
msg -n ":: Self-test requested, please wait..."
|
||||||
if _verify_checksum "${fs}"; then
|
if _verify_checksum "${fs}"; then
|
||||||
msg "done. Checksum is OK, continue booting."
|
msg "done. Checksum is OK, continue booting."
|
||||||
@@ -170,7 +170,7 @@ artix_mount_handler() {
|
|||||||
launch_interactive_shell
|
launch_interactive_shell
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "ERROR: checksum=y option specified but ${artixbasedir}/${arch}/${fs}.md5 not found"
|
echo "ERROR: checksum=y option specified but ${artixbasedir}/${arch}/${fs}.sha512 not found"
|
||||||
launch_interactive_shell
|
launch_interactive_shell
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -1,245 +0,0 @@
|
|||||||
# args: source, newroot, mountpoint
|
|
||||||
_mnt_dmsnapshot() {
|
|
||||||
local img="${1}"
|
|
||||||
local mnt="${2}"
|
|
||||||
local img_fullname="${img##*/}";
|
|
||||||
local img_name="${img_fullname%%.*}"
|
|
||||||
local dm_snap_name="${dm_snap_prefix}_${img_name}"
|
|
||||||
local ro_dev ro_dev_size rw_dev
|
|
||||||
|
|
||||||
ro_dev=$(losetup --find --show --read-only "${img}")
|
|
||||||
echo ${ro_dev} >> /run/miso/used_block_devices
|
|
||||||
ro_dev_size=$(blockdev --getsz ${ro_dev})
|
|
||||||
|
|
||||||
if [[ "${cow_persistent}" == "P" ]]; then
|
|
||||||
if [[ -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
|
|
||||||
msg ":: Found '/run/miso/cowspace/${cow_directory}/${img_name}.cow', using as persistent."
|
|
||||||
else
|
|
||||||
msg ":: Creating '/run/miso/cowspace/${cow_directory}/${img_name}.cow' as persistent."
|
|
||||||
truncate -s "${cow_spacesize}" "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
|
|
||||||
msg ":: Found '/run/miso/cowspace/${cow_directory}/${img_name}.cow' but non-persistent requested, removing."
|
|
||||||
rm -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
|
|
||||||
fi
|
|
||||||
msg ":: Creating '/run/miso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent."
|
|
||||||
truncate -s "${cow_spacesize}" "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rw_dev=$(losetup --find --show "/run/miso/cowspace/${cow_directory}/${img_name}.cow")
|
|
||||||
echo ${rw_dev} >> /run/miso/used_block_devices
|
|
||||||
|
|
||||||
dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
|
|
||||||
|
|
||||||
_mnt_dev "/dev/mapper/${dm_snap_name}" "${mnt}" "-w" "defaults"
|
|
||||||
echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/miso/used_block_devices
|
|
||||||
}
|
|
||||||
|
|
||||||
# args: source, newroot, mountpoint
|
|
||||||
_mnt_overlayfs() {
|
|
||||||
local src="${1}"
|
|
||||||
local newroot="${2}"
|
|
||||||
local mnt="${3}"
|
|
||||||
local work_dir="/run/miso/overlay_root/work"
|
|
||||||
local upper_dir="/run/miso/overlay_root/upper"
|
|
||||||
|
|
||||||
mkdir -p "${upper_dir}" "${work_dir}"
|
|
||||||
|
|
||||||
mount -t overlay overlay -o lowerdir="${src}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
|
|
||||||
}
|
|
||||||
|
|
||||||
# args: /path/to/image_file, mountpoint
|
|
||||||
_mnt_sfs() {
|
|
||||||
local img="${1}"
|
|
||||||
local mnt="${2}"
|
|
||||||
local img_fullname="${img##*/}"
|
|
||||||
local sfs_dev
|
|
||||||
|
|
||||||
if [[ "${copytoram}" == "y" ]]; then
|
|
||||||
msg -n ":: Copying squashfs image to RAM..."
|
|
||||||
if ! cp "${img}" "/run/miso/copytoram/${img_fullname}" ; then
|
|
||||||
echo "ERROR: while copy '${img}' to '/run/miso/copytoram/${img_fullname}'"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
img="/run/miso/copytoram/${img_fullname}"
|
|
||||||
msg "done."
|
|
||||||
fi
|
|
||||||
sfs_dev=$(losetup --find --show --read-only "${img}")
|
|
||||||
echo ${sfs_dev} >> /run/miso/used_block_devices
|
|
||||||
_mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults"
|
|
||||||
}
|
|
||||||
|
|
||||||
# args: device, mountpoint, flags, opts
|
|
||||||
_mnt_dev() {
|
|
||||||
local dev="${1}"
|
|
||||||
local mnt="${2}"
|
|
||||||
local flg="${3}"
|
|
||||||
local opts="${4}"
|
|
||||||
|
|
||||||
mkdir -p "${mnt}"
|
|
||||||
|
|
||||||
msg ":: Mounting '${dev}' to '${mnt}'"
|
|
||||||
|
|
||||||
while ! poll_device "${dev}" 30; do
|
|
||||||
echo "ERROR: '${dev}' device did not show up after 30 seconds..."
|
|
||||||
echo " Falling back to interactive prompt"
|
|
||||||
echo " You can try to fix the problem manually, log out when you are finished"
|
|
||||||
launch_interactive_shell
|
|
||||||
done
|
|
||||||
|
|
||||||
if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
|
|
||||||
msg ":: Device '${dev}' mounted successfully."
|
|
||||||
else
|
|
||||||
echo "ERROR; Failed to mount '${dev}'"
|
|
||||||
echo " Falling back to interactive prompt"
|
|
||||||
echo " You can try to fix the problem manually, log out when you are finished"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_verify_checksum() {
|
|
||||||
local _status
|
|
||||||
cd "/run/miso/bootmnt/${misobasedir}/${arch}"
|
|
||||||
md5sum -c $1.md5 > /tmp/checksum.log 2>&1
|
|
||||||
_status=$?
|
|
||||||
cd "${OLDPWD}"
|
|
||||||
return ${_status}
|
|
||||||
}
|
|
||||||
|
|
||||||
_verify_signature() {
|
|
||||||
local _status
|
|
||||||
cd "/run/miso/bootmnt/${misobasedir}/${arch}"
|
|
||||||
gpg --homedir /gpg --status-fd 1 --verify $1.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
|
|
||||||
_status=$?
|
|
||||||
cd "${OLDPWD}"
|
|
||||||
return ${_status}
|
|
||||||
}
|
|
||||||
|
|
||||||
run_hook() {
|
|
||||||
[[ -z "${arch}" ]] && arch="$(uname -m)"
|
|
||||||
[[ -z "${copytoram_size}" ]] && copytoram_size="75%"
|
|
||||||
[[ -z "${misobasedir}" ]] && misobasedir="cromnix"
|
|
||||||
|
|
||||||
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
|
|
||||||
[[ -z "${misodevice}" ]] && misodevice="/dev/disk/by-label/${misolabel}"
|
|
||||||
[[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"
|
|
||||||
[[ -z "${overlay_root_size}" ]] && overlay_root_size="75%"
|
|
||||||
|
|
||||||
if [[ -n "${cow_label}" ]]; then
|
|
||||||
cow_device="/dev/disk/by-label/${cow_label}"
|
|
||||||
[[ -z "${cow_persistent}" ]] && cow_persistent="P"
|
|
||||||
elif [[ -n "${cow_device}" ]]; then
|
|
||||||
[[ -z "${cow_persistent}" ]] && cow_persistent="P"
|
|
||||||
else
|
|
||||||
cow_persistent="N"
|
|
||||||
fi
|
|
||||||
|
|
||||||
[[ -z "${cow_flags}" ]] && cow_flags="defaults"
|
|
||||||
[[ -z "${cow_directory}" ]] && cow_directory="persistent_${misolabel}/${arch}"
|
|
||||||
[[ -z "${cow_chunksize}" ]] && cow_chunksize="8"
|
|
||||||
|
|
||||||
# set mount handler for miso
|
|
||||||
mount_handler="miso_mount_handler"
|
|
||||||
}
|
|
||||||
|
|
||||||
# This function is called normally from init script, but it can be called
|
|
||||||
# as chain from other mount handlers.
|
|
||||||
# args: /path/to/newroot
|
|
||||||
miso_mount_handler() {
|
|
||||||
local newroot="${1}"
|
|
||||||
|
|
||||||
if ! mountpoint -q "/run/miso/bootmnt"; then
|
|
||||||
_mnt_dev "${misodevice}" "/run/miso/bootmnt" "-r" "defaults"
|
|
||||||
if [[ "${copytoram}" != "y" ]]; then
|
|
||||||
echo $(readlink -f ${misodevice}) >> /run/miso/used_block_devices
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${checksum}" == "y" ]]; then
|
|
||||||
for fs in rootfs desktopfs livefs;do
|
|
||||||
if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs" ]]; then
|
|
||||||
if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.md5" ]]; then
|
|
||||||
msg -n ":: Self-test requested, please wait..."
|
|
||||||
if _verify_checksum "${fs}"; then
|
|
||||||
msg "done. Checksum is OK, continue booting."
|
|
||||||
else
|
|
||||||
echo "ERROR: one or more files are corrupted"
|
|
||||||
echo "see /tmp/checksum.log for details"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "ERROR: checksum=y option specified but ${misobasedir}/${arch}/${fs}.md5 not found"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${verify}" == "y" ]]; then
|
|
||||||
for fs in rootfs desktopfs livefs;do
|
|
||||||
if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs" ]]; then
|
|
||||||
if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs.sig" ]]; then
|
|
||||||
msg -n ":: Signature verification requested, please wait..."
|
|
||||||
if _verify_signature "${fs}"; then
|
|
||||||
msg "done. Signature is OK, continue booting."
|
|
||||||
else
|
|
||||||
echo "ERROR: one or more files are corrupted"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "ERROR: verify=y option specified but ${misobasedir}/${arch}/${fs}.sfs.sig not found"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${copytoram}" == "y" ]]; then
|
|
||||||
msg ":: Mounting /run/miso/copytoram (tmpfs) filesystem, size=${copytoram_size}"
|
|
||||||
mkdir -p /run/miso/copytoram
|
|
||||||
mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /run/miso/copytoram
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "${cow_device}" ]]; then
|
|
||||||
_mnt_dev "${cow_device}" "/run/miso/cowspace" "-r" "${cow_flags}"
|
|
||||||
echo $(readlink -f ${cow_device}) >> /run/miso/used_block_devices
|
|
||||||
mount -o remount,rw "/run/miso/cowspace"
|
|
||||||
else
|
|
||||||
msg ":: Mounting /run/miso/cowspace (tmpfs) filesystem, size=${cow_spacesize}..."
|
|
||||||
mkdir -p /run/miso/cowspace
|
|
||||||
mount -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace /run/miso/cowspace
|
|
||||||
fi
|
|
||||||
mkdir -p -m 0700 "/run/miso/cowspace/${cow_directory}"
|
|
||||||
|
|
||||||
msg -n ":: Mounting overlay root (tmpfs) filesystem, size=${overlay_root_size}..."
|
|
||||||
mkdir -p /run/miso/overlay_root
|
|
||||||
mount -t tmpfs -o "size=${overlay_root_size}",mode=0755 overlay_root /run/miso/overlay_root
|
|
||||||
|
|
||||||
local src="/run/miso/bootmnt/${misobasedir}/${arch}"
|
|
||||||
local dest_sfs="/run/miso/sfs" dest_img="/run/miso/img"
|
|
||||||
local lower_dir
|
|
||||||
|
|
||||||
for sfs in livefs desktopfs rootfs;do
|
|
||||||
if [[ -f "${src}/${sfs}.sfs" ]]; then
|
|
||||||
_mnt_sfs "${src}/${sfs}.sfs" "${dest_sfs}/${sfs}"
|
|
||||||
if [[ -f "${dest_sfs}/${sfs}/${sfs}.img" ]]; then
|
|
||||||
mkdir -p ${dest_img}
|
|
||||||
lower_dir=${lower_dir:-}${lower_dir:+:}"${dest_img}/${sfs}"
|
|
||||||
_mnt_dmsnapshot "${dest_sfs}/${sfs}/${sfs}.img" "${dest_img}/${sfs}"
|
|
||||||
else
|
|
||||||
lower_dir=${lower_dir:-}${lower_dir:+:}"${dest_sfs}/${sfs}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
_mnt_overlayfs "${lower_dir}" "${newroot}" "/"
|
|
||||||
|
|
||||||
if [[ "${copytoram}" == "y" ]]; then
|
|
||||||
umount -d /run/miso/bootmnt
|
|
||||||
mkdir -p /run/miso/bootmnt/${misobasedir}/${arch}
|
|
||||||
mount -o bind /run/miso/copytoram /run/miso/bootmnt/${misobasedir}/${arch}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim:ft=sh:ts=4:sw=4:et:
|
|
@@ -1,35 +0,0 @@
|
|||||||
# vim: set ft=sh:
|
|
||||||
|
|
||||||
run_hook () {
|
|
||||||
[[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}"
|
|
||||||
[[ -z "${img_flags}" ]] && img_flags="defaults"
|
|
||||||
if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then
|
|
||||||
mount_handler="miso_loop_mount_handler"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
miso_loop_mount_handler () {
|
|
||||||
newroot="${1}"
|
|
||||||
|
|
||||||
local _dev_loop
|
|
||||||
|
|
||||||
msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
|
|
||||||
_mnt_dev "${img_dev}" "/run/miso/img_dev" "-r" "${img_flags}"
|
|
||||||
if [[ "${copytoram}" != "y" ]]; then
|
|
||||||
echo $(readlink -f ${img_dev}) >> /run/miso/used_block_devices
|
|
||||||
fi
|
|
||||||
|
|
||||||
if _dev_loop=$(losetup --find --show --read-only "/run/miso/img_dev/${img_loop}"); then
|
|
||||||
misodevice="${_dev_loop}"
|
|
||||||
else
|
|
||||||
echo "ERROR: Setting loopback device for file '/run/miso/img_dev/${img_loop}'"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
|
|
||||||
miso_mount_handler ${newroot}
|
|
||||||
|
|
||||||
if [[ "${copytoram}" == "y" ]]; then
|
|
||||||
losetup -d ${_dev_loop} 2>/dev/null
|
|
||||||
umount /run/miso/img_dev
|
|
||||||
fi
|
|
||||||
}
|
|
@@ -1,72 +0,0 @@
|
|||||||
# vim: set ft=sh:
|
|
||||||
|
|
||||||
run_hook () {
|
|
||||||
# Do *not* declare 'bootif_dev' local! We need it in run_latehook().
|
|
||||||
local i net_mac bootif_mac
|
|
||||||
# These variables will be parsed from /tmp/net-*.conf generated by ipconfig
|
|
||||||
local DEVICE
|
|
||||||
local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1
|
|
||||||
local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH
|
|
||||||
local filename
|
|
||||||
# /tmp/net-*.conf
|
|
||||||
|
|
||||||
if [[ -n "${ip}" ]]; then
|
|
||||||
if [[ -n "${BOOTIF}" ]]; then
|
|
||||||
bootif_mac=${BOOTIF#01-}
|
|
||||||
bootif_mac=${bootif_mac//-/:}
|
|
||||||
for i in /sys/class/net/*/address; do
|
|
||||||
read net_mac < ${i}
|
|
||||||
if [[ "${bootif_mac}" == "${net_mac}" ]]; then
|
|
||||||
bootif_dev=${i#/sys/class/net/}
|
|
||||||
bootif_dev=${bootif_dev%/address}
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [[ "${ip}" == "dhcp" ]]; then
|
|
||||||
ip=":::::${bootif_dev}:dhcp"
|
|
||||||
else
|
|
||||||
ip="${ip}::${bootif_dev}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# setup network and save some values
|
|
||||||
if ! ipconfig -t 20 "ip=${ip}"; then
|
|
||||||
echo "ERROR; Failed to configure network"
|
|
||||||
echo " Falling back to interactive prompt"
|
|
||||||
echo " You can try to fix the problem manually, log out when you are finished"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
|
|
||||||
. /tmp/net-*.conf
|
|
||||||
|
|
||||||
pxeserver=${ROOTSERVER}
|
|
||||||
|
|
||||||
# setup DNS resolver
|
|
||||||
if [[ "${IPV4DNS0}" != "0.0.0.0" ]]; then
|
|
||||||
echo "# added by miso_pxe_common hook" > /etc/resolv.conf
|
|
||||||
echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf
|
|
||||||
fi
|
|
||||||
if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then
|
|
||||||
echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf
|
|
||||||
fi
|
|
||||||
if [[ -n "${DNSDOMAIN}" ]]; then
|
|
||||||
echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
|
|
||||||
echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
run_latehook () {
|
|
||||||
if [[ -n "${ip}" ]]; then
|
|
||||||
[[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y"
|
|
||||||
|
|
||||||
if [[ "${copytoram}" == "y" ]]; then
|
|
||||||
if [[ -n "${bootif_dev}" ]]; then
|
|
||||||
ip addr flush dev "${bootif_dev}"
|
|
||||||
ip link set "${bootif_dev}" down
|
|
||||||
fi
|
|
||||||
elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then
|
|
||||||
cp /etc/resolv.conf /new_root/etc/resolv.conf
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
@@ -1,59 +0,0 @@
|
|||||||
# vim: set ft=sh:
|
|
||||||
|
|
||||||
run_hook() {
|
|
||||||
if [[ -n "${ip}" && -n "${miso_http_srv}" ]]; then
|
|
||||||
|
|
||||||
# booting with http is always copy-to-ram, so set here to make sure
|
|
||||||
# addresses are flushed and interface is set down
|
|
||||||
copytoram="y"
|
|
||||||
|
|
||||||
miso_http_srv=$(eval echo ${miso_http_srv})
|
|
||||||
[[ -z "${miso_http_spc}" ]] && miso_http_spc="75%"
|
|
||||||
|
|
||||||
mount_handler="miso_pxe_http_mount_handler"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Fetch a file with CURL
|
|
||||||
#
|
|
||||||
# $1 URL
|
|
||||||
# $2 Destination directory inside httpspace/${misobasedir}
|
|
||||||
_curl_get() {
|
|
||||||
local _url="${1}"
|
|
||||||
local _dst="${2}"
|
|
||||||
|
|
||||||
msg ":: Downloading '${_url}'"
|
|
||||||
if ! curl -L -f -o "/run/miso/httpspace/${misobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
|
|
||||||
echo "ERROR: Downloading '${_url}'"
|
|
||||||
echo " Falling back to interactive prompt"
|
|
||||||
echo " You can try to fix the problem manually, log out when you are finished"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
miso_pxe_http_mount_handler () {
|
|
||||||
newroot="${1}"
|
|
||||||
|
|
||||||
msg ":: Mounting /run/miso/httpspace (tmpfs) filesystem, size='${miso_http_spc}'"
|
|
||||||
mkdir -p "/run/miso/httpspace"
|
|
||||||
mount -t tmpfs -o size="${miso_http_spc}",mode=0755 httpspace "/run/miso/httpspace"
|
|
||||||
|
|
||||||
local _src=${miso_http_srv}${misobasedir}/${arch}
|
|
||||||
|
|
||||||
for sfs in livefs desktopfs rootfs;do
|
|
||||||
if [[ ! -z "$( curl -s --head "${_src}/${sfs}.sfs" | grep "OK" )" ]]; then
|
|
||||||
_curl_get "${_src}/${sfs}.sfs" "/${arch}"
|
|
||||||
|
|
||||||
if [[ "${checksum}" == "y" ]]; then
|
|
||||||
_curl_get "${_src}/${sfs}.md5" "/${arch}"
|
|
||||||
fi
|
|
||||||
if [[ "${verify}" == "y" ]]; then
|
|
||||||
_curl_get "${_src}/${sfs}.sfs.sig" "/${arch}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
mkdir -p "/run/miso/bootmnt"
|
|
||||||
mount -o bind /run/miso/httpspace /run/miso/bootmnt
|
|
||||||
|
|
||||||
miso_mount_handler ${newroot}
|
|
||||||
}
|
|
@@ -1,47 +0,0 @@
|
|||||||
# vim: set ft=sh:
|
|
||||||
|
|
||||||
run_earlyhook() {
|
|
||||||
if [[ -n "${ip}" && -n "${miso_nbd_srv}" ]]; then
|
|
||||||
# Module autoloading like with loop devices does not work, doing manually...
|
|
||||||
modprobe nbd 2> /dev/null
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
run_hook() {
|
|
||||||
if [[ -n "${ip}" && -n "${miso_nbd_srv}" ]]; then
|
|
||||||
|
|
||||||
miso_nbd_srv=$(eval echo ${miso_nbd_srv})
|
|
||||||
[[ -z "${miso_nbd_name}" ]] && miso_nbd_name="miso"
|
|
||||||
|
|
||||||
mount_handler="miso_pxe_nbd_mount_handler"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
miso_pxe_nbd_mount_handler () {
|
|
||||||
newroot="${1}"
|
|
||||||
|
|
||||||
msg ":: Waiting for boot device..."
|
|
||||||
while ! poll_device /dev/nbd0 30; do
|
|
||||||
echo "ERROR: boot device didn't show up after 30 seconds..."
|
|
||||||
echo " Falling back to interactive prompt"
|
|
||||||
echo " You can try to fix the problem manually, log out when you are finished"
|
|
||||||
launch_interactive_shell
|
|
||||||
done
|
|
||||||
|
|
||||||
msg ":: Setup NBD from ${miso_nbd_srv} at /dev/nbd0"
|
|
||||||
if [[ "${copytoram}" != "n" ]]; then
|
|
||||||
nbd-client ${miso_nbd_srv} -N ${miso_nbd_name} /dev/nbd0
|
|
||||||
copytoram="y"
|
|
||||||
else
|
|
||||||
nbd-client ${miso_nbd_srv} -N ${miso_nbd_name} -persist /dev/nbd0
|
|
||||||
fi
|
|
||||||
|
|
||||||
misodevice=/dev/nbd0
|
|
||||||
|
|
||||||
miso_mount_handler ${newroot}
|
|
||||||
|
|
||||||
if [[ "${copytoram}" == "y" ]]; then
|
|
||||||
msg ":: Disconnect NBD from ${miso_nbd_srv} at /dev/nbd0"
|
|
||||||
nbd-client -d /dev/nbd0
|
|
||||||
fi
|
|
||||||
}
|
|
@@ -1,30 +0,0 @@
|
|||||||
# vim: set ft=sh:
|
|
||||||
|
|
||||||
run_hook() {
|
|
||||||
if [[ -n "${ip}" && -n "${miso_nfs_srv}" ]]; then
|
|
||||||
|
|
||||||
miso_nfs_srv=$(eval echo ${miso_nfs_srv})
|
|
||||||
[[ -n "${miso_nfs_opt}" ]] && miso_nfs_opt="-o ${miso_nfs_opt}"
|
|
||||||
|
|
||||||
mount_handler="miso_nfs_mount_handler"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
miso_nfs_mount_handler() {
|
|
||||||
newroot="${1}"
|
|
||||||
mkdir -p "/run/miso/bootmnt"
|
|
||||||
msg ":: Mounting '${miso_nfs_srv}'"
|
|
||||||
# Do not put "${miso_nfs_opt}" nfsmount fails!
|
|
||||||
if ! nfsmount ${miso_nfs_opt} "${miso_nfs_srv}" "/run/miso/bootmnt"; then
|
|
||||||
echo "ERROR: Mounting '${miso_nfs_srv}'"
|
|
||||||
echo " Falling back to interactive prompt"
|
|
||||||
echo " You can try to fix the problem manually, log out when you are finished"
|
|
||||||
launch_interactive_shell
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${copytoram}" != "n" ]]; then
|
|
||||||
copytoram="y"
|
|
||||||
fi
|
|
||||||
|
|
||||||
miso_mount_handler ${newroot}
|
|
||||||
}
|
|
@@ -1,6 +0,0 @@
|
|||||||
run_cleanuphook() {
|
|
||||||
rm -rf /usr/lib/modules
|
|
||||||
cp -ax / /run/initramfs
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
@@ -1,30 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
build() {
|
|
||||||
add_module "cdrom"
|
|
||||||
add_module "loop"
|
|
||||||
add_module "dm-snapshot"
|
|
||||||
add_module "overlay"
|
|
||||||
|
|
||||||
add_runscript
|
|
||||||
|
|
||||||
add_binary /usr/lib/udev/cdrom_id
|
|
||||||
add_binary blockdev
|
|
||||||
add_binary dmsetup
|
|
||||||
add_binary losetup
|
|
||||||
add_binary mountpoint
|
|
||||||
add_binary truncate
|
|
||||||
add_binary gpg
|
|
||||||
add_binary grep
|
|
||||||
|
|
||||||
add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
|
|
||||||
add_file /usr/lib/udev/rules.d/10-dm.rules
|
|
||||||
add_file /usr/lib/udev/rules.d/95-dm-notify.rules
|
|
||||||
add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
|
|
||||||
if [[ $MISO_GNUPG_FD ]]; then
|
|
||||||
mkdir -p "$BUILDROOT$dest"/gpg
|
|
||||||
gpg --homedir "$BUILDROOT$dest"/gpg --import <&$MISO_GNUPG_FD
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
@@ -1,26 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
build() {
|
|
||||||
add_module "radeon"
|
|
||||||
add_module "nouveau"
|
|
||||||
add_module "i915"
|
|
||||||
add_module "via-agp"
|
|
||||||
add_module "sis-agp"
|
|
||||||
add_module "intel-agp"
|
|
||||||
|
|
||||||
if [[ $(uname -m) == i686 ]]; then
|
|
||||||
add_module "amd64-agp"
|
|
||||||
add_module "ati-agp"
|
|
||||||
add_module "sworks-agp"
|
|
||||||
add_module "ali-agp"
|
|
||||||
add_module "amd-k7-agp"
|
|
||||||
add_module "nvidia-agp"
|
|
||||||
add_module "efficeon-agp"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
help() {
|
|
||||||
cat << HELPEOF
|
|
||||||
Adds all common KMS drivers to the initramfs image.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
@@ -1,13 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
build() {
|
|
||||||
add_runscript
|
|
||||||
}
|
|
||||||
|
|
||||||
help() {
|
|
||||||
cat<<HELPEOF
|
|
||||||
This hook loads the necessary modules for boot via loop device.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
@@ -1,26 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
build() {
|
|
||||||
add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/"
|
|
||||||
|
|
||||||
add_runscript
|
|
||||||
|
|
||||||
add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig
|
|
||||||
|
|
||||||
# Add hosts support files+dns
|
|
||||||
add_symlink /usr/lib/libnss_files.so.2 $(readlink /usr/lib/libnss_files.so.2)
|
|
||||||
add_binary $(readlink -f /usr/lib/libnss_files.so.2)
|
|
||||||
add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2)
|
|
||||||
add_binary $(readlink -f /usr/lib/libnss_dns.so.2)
|
|
||||||
|
|
||||||
add_dir /etc
|
|
||||||
echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf
|
|
||||||
}
|
|
||||||
|
|
||||||
help() {
|
|
||||||
cat<<HELPEOF
|
|
||||||
This hook loads the necessary modules for boot via PXE.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
@@ -1,17 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
build() {
|
|
||||||
add_runscript
|
|
||||||
|
|
||||||
add_binary curl
|
|
||||||
|
|
||||||
add_file $(readlink -f /etc/ssl/certs/ca-certificates.crt) /etc/ssl/certs/ca-certificates.crt
|
|
||||||
}
|
|
||||||
|
|
||||||
help() {
|
|
||||||
cat<<HELPEOF
|
|
||||||
This hook loads the necessary modules for boot via PXE and HTTP.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
@@ -1,17 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
build() {
|
|
||||||
add_module "nbd"
|
|
||||||
|
|
||||||
add_runscript
|
|
||||||
|
|
||||||
add_binary nbd-client
|
|
||||||
}
|
|
||||||
|
|
||||||
help() {
|
|
||||||
cat<<HELPEOF
|
|
||||||
This hook loads the necessary modules for boot via PXE and NBD.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
@@ -1,17 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
build() {
|
|
||||||
add_module "nfs"
|
|
||||||
|
|
||||||
add_runscript
|
|
||||||
|
|
||||||
add_binary /usr/lib/initcpio/nfsmount /bin/nfsmount
|
|
||||||
}
|
|
||||||
|
|
||||||
help() {
|
|
||||||
cat <<HELPEOF
|
|
||||||
This hook loads the necessary modules for boot via PXE and NFS.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
@@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
build() {
|
|
||||||
add_binary cp
|
|
||||||
|
|
||||||
add_runscript
|
|
||||||
|
|
||||||
add_file /etc/initcpio/miso_shutdown /shutdown
|
|
||||||
}
|
|
||||||
|
|
||||||
help() {
|
|
||||||
cat <<HELPEOF
|
|
||||||
This hook will create a shutdown initramfs in /run/initramfs
|
|
||||||
that we can pivot to on shutdown in order to unmount / and
|
|
||||||
and others mount points, dm-snapshot devices and loopback devices.
|
|
||||||
Mostly usefull for dm-snapshot persistent.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
@@ -23,6 +23,9 @@ create_min_fs(){
|
|||||||
mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
|
mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
|
||||||
mkdir -m 1777 -p $1/{tmp,run}
|
mkdir -m 1777 -p $1/{tmp,run}
|
||||||
mkdir -m 0555 -p $1/{sys,proc}
|
mkdir -m 0555 -p $1/{sys,proc}
|
||||||
|
if [[ ! -f $1/etc/machine-id ]];then
|
||||||
|
touch $1/etc/machine-id
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
is_btrfs() {
|
is_btrfs() {
|
||||||
@@ -69,51 +72,19 @@ default_mirror(){
|
|||||||
echo "Server = $mirror" > $mnt/etc/pacman.d/mirrorlist
|
echo "Server = $mirror" > $mnt/etc/pacman.d/mirrorlist
|
||||||
}
|
}
|
||||||
|
|
||||||
create_chroot(){
|
|
||||||
local timer=$(get_timer)
|
|
||||||
setarch "${target_arch}" \
|
|
||||||
mkchroot "$@"
|
|
||||||
show_elapsed_time "${FUNCNAME}" "${timer}"
|
|
||||||
}
|
|
||||||
|
|
||||||
delete_chroot() {
|
|
||||||
local copydir=$1
|
|
||||||
local copy=${1:-$2}
|
|
||||||
|
|
||||||
stat_busy "Removing chroot copy [%s]" "$copy"
|
|
||||||
if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
|
|
||||||
subvolume_delete_recursive "$copydir" ||
|
|
||||||
die "Unable to delete subvolume %s" "$copydir"
|
|
||||||
else
|
|
||||||
# avoid change of filesystem in case of an umount failure
|
|
||||||
rm --recursive --force --one-file-system "$copydir" ||
|
|
||||||
die "Unable to delete %s" "$copydir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# remove lock file
|
|
||||||
rm -f "$copydir.lock"
|
|
||||||
stat_done
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
# $1: chroot
|
||||||
# kill_chroot_process(){
|
kill_chroot_process(){
|
||||||
# # enable to have more debug info
|
local prefix="$1" flink pid name
|
||||||
# #msg "machine-id (etc): $(cat $1/etc/machine-id)"
|
for root_dir in /proc/*/root; do
|
||||||
# #[[ -e $1/var/lib/dbus/machine-id ]] && msg "machine-id (lib): $(cat $1/var/lib/dbus/machine-id)"
|
flink=$(readlink $root_dir)
|
||||||
# #msg "running processes: "
|
if [ "x$flink" != "x" ]; then
|
||||||
# #lsof | grep $1
|
if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
|
||||||
#
|
# this process is in the chroot...
|
||||||
# local prefix="$1" flink pid name
|
pid=$(basename $(dirname "$root_dir"))
|
||||||
# for root_dir in /proc/*/root; do
|
name=$(ps -p $pid -o comm=)
|
||||||
# flink=$(readlink $root_dir)
|
info "Killing chroot process: %s (%s)" "$name" "$pid"
|
||||||
# if [ "x$flink" != "x" ]; then
|
kill -9 "$pid"
|
||||||
# if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
|
fi
|
||||||
# # this process is in the chroot...
|
fi
|
||||||
# pid=$(basename $(dirname "$root_dir"))
|
done
|
||||||
# name=$(ps -p $pid -o comm=)
|
}
|
||||||
# info "Killing chroot process: %s (%s)" "$name" "$pid"
|
|
||||||
# kill -9 "$pid"
|
|
||||||
# fi
|
|
||||||
# fi
|
|
||||||
# done
|
|
||||||
# }
|
|
||||||
|
@@ -13,6 +13,7 @@ declare -A pseudofs_types=([anon_inodefs]=1
|
|||||||
[bdev]=1
|
[bdev]=1
|
||||||
[binfmt_misc]=1
|
[binfmt_misc]=1
|
||||||
[cgroup]=1
|
[cgroup]=1
|
||||||
|
[cgroup2]=1
|
||||||
[configfs]=1
|
[configfs]=1
|
||||||
[cpuset]=1
|
[cpuset]=1
|
||||||
[debugfs]=1
|
[debugfs]=1
|
||||||
@@ -72,7 +73,7 @@ valid_number_of_base() {
|
|||||||
mangle() {
|
mangle() {
|
||||||
local i= chr= out=
|
local i= chr= out=
|
||||||
|
|
||||||
unset {a..f} {A..F}
|
local {a..f}= {A..F}=
|
||||||
|
|
||||||
for (( i = 0; i < ${#1}; i++ )); do
|
for (( i = 0; i < ${#1}; i++ )); do
|
||||||
chr=${1:i:1}
|
chr=${1:i:1}
|
||||||
@@ -91,7 +92,7 @@ mangle() {
|
|||||||
unmangle() {
|
unmangle() {
|
||||||
local i= chr= out= len=$(( ${#1} - 4 ))
|
local i= chr= out= len=$(( ${#1} - 4 ))
|
||||||
|
|
||||||
unset {a..f} {A..F}
|
local {a..f}= {A..F}=
|
||||||
|
|
||||||
for (( i = 0; i < len; i++ )); do
|
for (( i = 0; i < len; i++ )); do
|
||||||
chr=${1:i:1}
|
chr=${1:i:1}
|
||||||
|
@@ -1,136 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; version 2 of the License.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
|
|
||||||
add_svc_rc(){
|
|
||||||
local mnt="$1" name="$2" rlvl="$3"
|
|
||||||
if [[ -f $mnt/etc/init.d/$name ]];then
|
|
||||||
msg2 "Setting %s ..." "$name"
|
|
||||||
chroot $mnt rc-update add $name $rlvl &>/dev/null
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
set_xdm(){
|
|
||||||
if [[ -f $1/etc/conf.d/xdm ]];then
|
|
||||||
local conf='DISPLAYMANAGER="'${displaymanager}'"'
|
|
||||||
sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" $1/etc/conf.d/xdm
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_hosts(){
|
|
||||||
sed -e "s|localhost.localdomain|localhost.localdomain ${hostname}|" -i $1/etc/hosts
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_lsb(){
|
|
||||||
local conf=$1/etc/lsb-release
|
|
||||||
if [[ -e $conf ]] ; then
|
|
||||||
msg2 "Configuring lsb-release"
|
|
||||||
sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${dist_release}/" $conf
|
|
||||||
# sed -i -e "s/^.*DISTRIB_CODENAME.*/DISTRIB_CODENAME=${dist_codename}/" $conf
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_logind(){
|
|
||||||
local conf=$1/etc/$2/logind.conf
|
|
||||||
if [[ -e $conf ]];then
|
|
||||||
msg2 "Configuring logind ..."
|
|
||||||
sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
|
|
||||||
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
|
|
||||||
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_services(){
|
|
||||||
local mnt="$1"
|
|
||||||
info "Configuring [%s]" "${initsys}"
|
|
||||||
case ${initsys} in
|
|
||||||
'openrc')
|
|
||||||
for svc in ${openrc_boot[@]}; do
|
|
||||||
add_svc_rc "$mnt" "$svc" "boot"
|
|
||||||
done
|
|
||||||
for svc in ${openrc_default[@]}; do
|
|
||||||
[[ $svc == "xdm" ]] && set_xdm "$mnt"
|
|
||||||
add_svc_rc "$mnt" "$svc" "default"
|
|
||||||
done
|
|
||||||
for svc in ${enable_live[@]}; do
|
|
||||||
add_svc_rc "$mnt" "$svc" "default"
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
info "Done configuring [%s]" "${initsys}"
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_system(){
|
|
||||||
local mnt="$1"
|
|
||||||
case ${initsys} in
|
|
||||||
'openrc')
|
|
||||||
configure_logind "$mnt" "elogind"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
echo ${hostname} > $mnt/etc/hostname
|
|
||||||
}
|
|
||||||
|
|
||||||
clean_iso_root(){
|
|
||||||
local dest="$1"
|
|
||||||
msg "Deleting isoroot [%s] ..." "${dest##*/}"
|
|
||||||
rm -rf --one-file-system "$dest"
|
|
||||||
}
|
|
||||||
|
|
||||||
clean_up_image(){
|
|
||||||
local path mnt="$1"
|
|
||||||
msg2 "Cleaning [%s]" "${mnt##*/}"
|
|
||||||
|
|
||||||
default_locale "reset" "$mnt"
|
|
||||||
path=$mnt/boot
|
|
||||||
if [[ -d "$path" ]]; then
|
|
||||||
find "$path" -name 'initramfs*.img' -delete &> /dev/null
|
|
||||||
fi
|
|
||||||
path=$mnt/var/lib/pacman/sync
|
|
||||||
if [[ -d $path ]];then
|
|
||||||
find "$path" -type f -delete &> /dev/null
|
|
||||||
fi
|
|
||||||
path=$mnt/var/cache/pacman/pkg
|
|
||||||
if [[ -d $path ]]; then
|
|
||||||
find "$path" -type f -delete &> /dev/null
|
|
||||||
fi
|
|
||||||
path=$mnt/var/log
|
|
||||||
if [[ -d $path ]]; then
|
|
||||||
find "$path" -type f -delete &> /dev/null
|
|
||||||
fi
|
|
||||||
path=$mnt/var/tmp
|
|
||||||
if [[ -d $path ]];then
|
|
||||||
find "$path" -mindepth 1 -delete &> /dev/null
|
|
||||||
fi
|
|
||||||
path=$mnt/tmp
|
|
||||||
if [[ -d $path ]];then
|
|
||||||
find "$path" -mindepth 1 -delete &> /dev/null
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${mnt##*/} == 'livefs' ]];then
|
|
||||||
rm -rf "$mnt/etc/pacman.d/gnupg"
|
|
||||||
fi
|
|
||||||
|
|
||||||
find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
|
|
||||||
file=$mnt/boot/grub/grub.cfg
|
|
||||||
if [[ -f "$file" ]]; then
|
|
||||||
rm $file
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
chroot_clean(){
|
|
||||||
local dest="$1"
|
|
||||||
for root in "$dest"/*; do
|
|
||||||
[[ -d ${root} ]] || continue
|
|
||||||
local name=${root##*/}
|
|
||||||
delete_chroot "${root}" "$dest"
|
|
||||||
done
|
|
||||||
rm -rf --one-file-system "$dest"
|
|
||||||
}
|
|
||||||
|
|
@@ -19,7 +19,7 @@ prepare_initcpio(){
|
|||||||
|
|
||||||
prepare_initramfs(){
|
prepare_initramfs(){
|
||||||
local mnt="$1"
|
local mnt="$1"
|
||||||
cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${os_id}.conf
|
cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${iso_name}.conf
|
||||||
if [[ -n ${gpgkey} ]]; then
|
if [[ -n ${gpgkey} ]]; then
|
||||||
user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
|
user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
|
||||||
exec 17<>${AT_USERCONFDIR}/gpgkey
|
exec 17<>${AT_USERCONFDIR}/gpgkey
|
||||||
@@ -27,7 +27,7 @@ prepare_initramfs(){
|
|||||||
local _kernel=$(cat $mnt/usr/lib/modules/*/version)
|
local _kernel=$(cat $mnt/usr/lib/modules/*/version)
|
||||||
ARTIX_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
|
ARTIX_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
|
||||||
/usr/bin/mkinitcpio -k ${_kernel} \
|
/usr/bin/mkinitcpio -k ${_kernel} \
|
||||||
-c /etc/mkinitcpio-${os_id}.conf \
|
-c /etc/mkinitcpio-${iso_name}.conf \
|
||||||
-g /boot/initramfs.img
|
-g /boot/initramfs.img
|
||||||
|
|
||||||
if [[ -n ${gpgkey} ]]; then
|
if [[ -n ${gpgkey} ]]; then
|
||||||
@@ -46,6 +46,16 @@ prepare_boot_extras(){
|
|||||||
cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
|
cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configure_grub(){
|
||||||
|
local conf="$1"
|
||||||
|
|
||||||
|
sed -e "s|@arch@|${target_arch}|g" \
|
||||||
|
-e "s|@iso_label@|${iso_label}|" \
|
||||||
|
-e "s|@iso_name@|${iso_name}|g" \
|
||||||
|
-e "s|@kernel_args@|${kernel_args}|g" \
|
||||||
|
-i $conf
|
||||||
|
}
|
||||||
|
|
||||||
prepare_grub(){
|
prepare_grub(){
|
||||||
local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
|
local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
|
||||||
lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
|
lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
|
||||||
@@ -83,7 +93,7 @@ prepare_grub(){
|
|||||||
grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
|
grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
|
||||||
|
|
||||||
prepare_dir ${grub}/themes
|
prepare_dir ${grub}/themes
|
||||||
cp -r ${theme}/themes/${os_id} ${grub}/themes/
|
cp -r ${theme}/themes/${iso_name} ${grub}/themes/
|
||||||
cp ${data}/unicode.pf2 ${grub}
|
cp ${data}/unicode.pf2 ${grub}
|
||||||
cp -r ${theme}/{locales,tz} ${grub}
|
cp -r ${theme}/{locales,tz} ${grub}
|
||||||
|
|
||||||
|
@@ -1,65 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; version 2 of the License.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
|
|
||||||
track_img() {
|
|
||||||
info "mount: [%s]" "$2"
|
|
||||||
mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
|
|
||||||
}
|
|
||||||
|
|
||||||
mount_img() {
|
|
||||||
IMG_ACTIVE_MOUNTS=()
|
|
||||||
mkdir -p "$2"
|
|
||||||
track_img "$1" "$2"
|
|
||||||
}
|
|
||||||
|
|
||||||
umount_img() {
|
|
||||||
if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
|
|
||||||
info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
|
|
||||||
umount "${IMG_ACTIVE_MOUNTS[@]}"
|
|
||||||
unset IMG_ACTIVE_MOUNTS
|
|
||||||
rm -r "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
track_fs() {
|
|
||||||
info "overlayfs mount: [%s]" "$5"
|
|
||||||
mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
|
|
||||||
}
|
|
||||||
|
|
||||||
mount_fs(){
|
|
||||||
FS_ACTIVE_MOUNTS=()
|
|
||||||
local lower= upper="$1" work="$2" pkglist="$3"
|
|
||||||
local fs=${upper##*/}
|
|
||||||
local rootfs="$work/rootfs" desktopfs="$work/desktopfs" livefs="$work/livefs"
|
|
||||||
mkdir -p "${mnt_dir}/work"
|
|
||||||
mkdir -p "$upper"
|
|
||||||
case $fs in
|
|
||||||
desktopfs) lower="$rootfs" ;;
|
|
||||||
livefs)
|
|
||||||
lower="$rootfs"
|
|
||||||
[[ -f $pkglist ]] && lower="$desktopfs":"$rootfs"
|
|
||||||
;;
|
|
||||||
bootfs)
|
|
||||||
lower="$livefs":"$rootfs"
|
|
||||||
[[ -f $pkglist ]] && lower="$livefs":"$desktopfs":"$rootfs"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
|
|
||||||
}
|
|
||||||
|
|
||||||
umount_fs(){
|
|
||||||
if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
|
|
||||||
info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
|
|
||||||
umount "${FS_ACTIVE_MOUNTS[@]}"
|
|
||||||
unset FS_ACTIVE_MOUNTS
|
|
||||||
rm -rf "${mnt_dir}/work"
|
|
||||||
fi
|
|
||||||
}
|
|
@@ -8,31 +8,29 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
write_repo_conf(){
|
|
||||||
local repos=$(find $USER_HOME -type f -name "repo_info")
|
|
||||||
local path name
|
|
||||||
[[ -z ${repos[@]} ]] && run_dir=${DATADIR}/iso-profiles && return 1
|
|
||||||
for r in ${repos[@]}; do
|
|
||||||
path=${r%/repo_info}
|
|
||||||
name=${path##*/}
|
|
||||||
echo "run_dir=$path" > ${AT_USERCONFDIR}/$name.conf
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
load_run_dir(){
|
|
||||||
local gitrepo='iso-profiles'
|
|
||||||
[[ -f ${AT_USERCONFDIR}/$gitrepo.conf ]] || write_repo_conf
|
|
||||||
[[ -r ${AT_USERCONFDIR}/$gitrepo.conf ]] && source ${AT_USERCONFDIR}/$gitrepo.conf
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
load_profile(){
|
load_profile(){
|
||||||
local profdir="$1"
|
local prof="$1"
|
||||||
local profile_conf="$profdir/profile.conf"
|
local profdir="${DATADIR}/iso-profiles/$prof"
|
||||||
|
[[ "$prof" != 'base' ]] && profdir=${workspace_dir}/iso-profiles/$prof
|
||||||
|
|
||||||
[[ -f ${profile_conf} ]] || return 1
|
root_list="${DATADIR}/iso-profiles/base/Packages-Root"
|
||||||
|
[[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
|
||||||
|
|
||||||
[[ -r ${profile_conf} ]] && source ${profile_conf}
|
root_overlay="${DATADIR}/iso-profiles/base/root-overlay"
|
||||||
|
[[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
|
||||||
|
|
||||||
|
[[ -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
|
||||||
|
|
||||||
[[ -z ${displaymanager} ]] && displaymanager="none"
|
[[ -z ${displaymanager} ]] && displaymanager="none"
|
||||||
|
|
||||||
@@ -46,7 +44,7 @@ load_profile(){
|
|||||||
[[ -z ${password} ]] && password="artix"
|
[[ -z ${password} ]] && password="artix"
|
||||||
|
|
||||||
if [[ -z ${addgroups} ]];then
|
if [[ -z ${addgroups} ]];then
|
||||||
addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
|
addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z ${openrc_boot[@]} ]];then
|
if [[ -z ${openrc_boot[@]} ]];then
|
||||||
@@ -61,44 +59,11 @@ load_profile(){
|
|||||||
|
|
||||||
enable_live=('artix-live' 'pacman-init')
|
enable_live=('artix-live' 'pacman-init')
|
||||||
|
|
||||||
[[ -z ${netgroups} ]] && netgroups="https://raw.githubusercontent.com/artix-linux/netgroups/master"
|
[[ -z ${netgroups_url} ]] && netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
|
||||||
|
|
||||||
root_list=${DATADIR}/iso-profiles/base/Packages-Root
|
|
||||||
[[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
|
|
||||||
|
|
||||||
root_overlay="${DATADIR}/iso-profiles/base/root-overlay"
|
|
||||||
[[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
|
|
||||||
|
|
||||||
[[ -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"
|
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
reset_profile(){
|
|
||||||
unset displaymanager
|
|
||||||
unset autologin
|
|
||||||
unset hostname
|
|
||||||
unset username
|
|
||||||
unset password
|
|
||||||
unset addgroups
|
|
||||||
unset openrc_boot
|
|
||||||
unset openrc_default
|
|
||||||
unset enable_live
|
|
||||||
unset root_list
|
|
||||||
unset desktop_list
|
|
||||||
unset live_list
|
|
||||||
unset root_overlay
|
|
||||||
unset desktop_overlay
|
|
||||||
unset live_overlay
|
|
||||||
}
|
|
||||||
|
|
||||||
write_live_session_conf(){
|
write_live_session_conf(){
|
||||||
local path=$1${SYSCONFDIR}
|
local path=$1${SYSCONFDIR}
|
||||||
[[ ! -d $path ]] && mkdir -p "$path"
|
[[ ! -d $path ]] && mkdir -p "$path"
|
||||||
@@ -119,9 +84,8 @@ write_live_session_conf(){
|
|||||||
echo "addgroups='${addgroups}'" >> ${conf}
|
echo "addgroups='${addgroups}'" >> ${conf}
|
||||||
}
|
}
|
||||||
|
|
||||||
# $1: file name
|
|
||||||
load_pkgs(){
|
load_pkgs(){
|
||||||
local pkglist="$1" arch="$2" init="$3" _kv="$4"
|
local pkglist="$1" init="$2" _kv="$3"
|
||||||
info "Loading Packages: [%s] ..." "${pkglist##*/}"
|
info "Loading Packages: [%s] ..." "${pkglist##*/}"
|
||||||
|
|
||||||
local _init="s|>$init||g"
|
local _init="s|>$init||g"
|
||||||
@@ -131,13 +95,6 @@ load_pkgs(){
|
|||||||
'runit') _init_rm1="s|>s6.*||g"; _init_rm2="s|>openrc.*||g" ;;
|
'runit') _init_rm1="s|>s6.*||g"; _init_rm2="s|>openrc.*||g" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
local _arch="s|>x86_64||g" _arch_rm="s|>i686.*||g"
|
|
||||||
|
|
||||||
if [[ "$arch" == 'i686' ]];then
|
|
||||||
_arch="s|>i686||g"
|
|
||||||
_arch_rm="s|>x86_64.*||g"
|
|
||||||
fi
|
|
||||||
|
|
||||||
local _blacklist="s|>blacklist.*||g" \
|
local _blacklist="s|>blacklist.*||g" \
|
||||||
_kernel="s|KERNEL|$_kv|g" \
|
_kernel="s|KERNEL|$_kv|g" \
|
||||||
_space="s| ||g" \
|
_space="s| ||g" \
|
||||||
@@ -151,8 +108,6 @@ load_pkgs(){
|
|||||||
| sed "$_init" \
|
| sed "$_init" \
|
||||||
| sed "$_init_rm1" \
|
| sed "$_init_rm1" \
|
||||||
| sed "$_init_rm2" \
|
| sed "$_init_rm2" \
|
||||||
| sed "$_arch" \
|
|
||||||
| sed "$_arch_rm" \
|
|
||||||
| sed "$_kernel" \
|
| sed "$_kernel" \
|
||||||
| sed "$_clean"))
|
| sed "$_clean"))
|
||||||
}
|
}
|
@@ -9,10 +9,15 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
connect(){
|
||||||
|
local home="/home/frs/project/${project}"
|
||||||
|
echo "${account},${project}@frs.${file_host}:${home}"
|
||||||
|
}
|
||||||
|
|
||||||
gen_webseed(){
|
gen_webseed(){
|
||||||
local webseed seed="$1"
|
local webseed seed="$1"
|
||||||
for mirror in ${host_mirrors[@]};do
|
for mirror in ${host_mirrors[@]};do
|
||||||
webseed=${webseed:-}${webseed:+,}"http://${mirror}.dl.${seed}"
|
webseed=${webseed:-}${webseed:+,}"https://${mirror}.dl.${seed}"
|
||||||
done
|
done
|
||||||
echo ${webseed}
|
echo ${webseed}
|
||||||
}
|
}
|
||||||
@@ -22,9 +27,10 @@ make_torrent(){
|
|||||||
|
|
||||||
if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then
|
if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then
|
||||||
for iso in $(ls ${src_dir}/*.iso);do
|
for iso in $(ls ${src_dir}/*.iso);do
|
||||||
local seed=${host}/project/${project}/${target_dir}/${iso##*/}
|
local seed=${file_host}/project/${project}${target_dir}${iso##*/}
|
||||||
local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w $(gen_webseed ${seed}))
|
local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w $(gen_webseed ${seed}))
|
||||||
${verbose} && mktorrent_args+=(-v)
|
${verbose} && mktorrent_args+=(-v)
|
||||||
|
info "mktorrent_args: %s" "${mktorrent_args[@]}"
|
||||||
msg2 "Creating (%s) ..." "${iso##*/}.torrent"
|
msg2 "Creating (%s) ..." "${iso##*/}.torrent"
|
||||||
mktorrent ${mktorrent_args[*]} -o ${iso}.torrent ${iso}
|
mktorrent ${mktorrent_args[*]} -o ${iso}.torrent ${iso}
|
||||||
done
|
done
|
||||||
@@ -33,7 +39,7 @@ make_torrent(){
|
|||||||
|
|
||||||
prepare_transfer(){
|
prepare_transfer(){
|
||||||
target_dir="/iso/${profile}/"
|
target_dir="/iso/${profile}/"
|
||||||
src_dir="${cache_dir_iso}/${profile}/"
|
src_dir="${iso_pool}/${profile}/"
|
||||||
${torrent} && make_torrent
|
${torrent} && make_torrent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
108
lib/util-iso-yaml.sh
Normal file
108
lib/util-iso-yaml.sh
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; version 2 of the License.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
write_bootloader_conf(){
|
||||||
|
local conf="$1/bootloader.conf"
|
||||||
|
msg2 "Writing %s ..." "${conf##*/}"
|
||||||
|
echo '---' > "$conf"
|
||||||
|
echo "efiBootLoader: \"grub\"" >> "$conf"
|
||||||
|
echo "kernel: \"/vmlinuz-$kernel-${target_arch}\"" >> "$conf"
|
||||||
|
echo "img: \"/initramfs-$kernel-${target_arch}.img\"" >> "$conf"
|
||||||
|
echo "fallback: \"/initramfs-$kernel-${target_arch}-fallback.img\"" >> "$conf"
|
||||||
|
echo 'timeout: "10"' >> "$conf"
|
||||||
|
echo "kernelLine: \", with ${kernel}\"" >> "$conf"
|
||||||
|
echo "fallbackKernelLine: \", with ${kernel} (fallback initramfs)\"" >> "$conf"
|
||||||
|
echo 'grubInstall: "grub-install"' >> "$conf"
|
||||||
|
echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
|
||||||
|
echo 'grubCfg: "/boot/grub/grub.cfg"' >> "$conf"
|
||||||
|
echo '#efiBootloaderId: "dirname"' >> "$conf"
|
||||||
|
}
|
||||||
|
|
||||||
|
write_servicescfg_conf(){
|
||||||
|
local conf="$1/servicescfg.conf"
|
||||||
|
msg2 "Writing %s ..." "${conf##*/}"
|
||||||
|
echo '---' > "$conf"
|
||||||
|
echo '' >> "$conf"
|
||||||
|
echo 'services:' >> "$conf"
|
||||||
|
echo ' enabled:' >> "$conf"
|
||||||
|
for s in ${openrc_boot[@]};do
|
||||||
|
echo " - name: $s" >> "$conf"
|
||||||
|
echo ' runlevel: boot' >> "$conf"
|
||||||
|
done
|
||||||
|
for s in ${openrc_default[@]};do
|
||||||
|
echo " - name: $s" >> "$conf"
|
||||||
|
echo ' runlevel: default' >> "$conf"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
write_initcpio_conf(){
|
||||||
|
local conf="$1/initcpio.conf"
|
||||||
|
msg2 "Writing %s ..." "${conf##*/}"
|
||||||
|
echo "---" > "$conf"
|
||||||
|
echo "kernel: ${kernel}" >> "$conf"
|
||||||
|
}
|
||||||
|
|
||||||
|
write_users_conf(){
|
||||||
|
local conf="$1/users.conf"
|
||||||
|
msg2 "Writing %s ..." "${conf##*/}"
|
||||||
|
echo "---" > "$conf"
|
||||||
|
echo "defaultGroups:" >> "$conf"
|
||||||
|
local IFS=','
|
||||||
|
for g in ${addgroups[@]};do
|
||||||
|
echo " - $g" >> "$conf"
|
||||||
|
done
|
||||||
|
unset IFS
|
||||||
|
echo "autologinGroup: autologin" >> "$conf"
|
||||||
|
echo "doAutologin: false" >> "$conf"
|
||||||
|
echo "sudoersGroup: wheel" >> "$conf"
|
||||||
|
echo "setRootPassword: true" >> "$conf"
|
||||||
|
echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
|
||||||
|
echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
|
||||||
|
echo "avatarFilePath: ~/.face" >> "$conf"
|
||||||
|
}
|
||||||
|
|
||||||
|
write_netinstall_conf(){
|
||||||
|
local conf="$1/netinstall.conf"
|
||||||
|
msg2 "Writing %s ..." "${conf##*/}"
|
||||||
|
echo "---" > "$conf"
|
||||||
|
echo "groupsUrl: ${netgroups}" >> "$conf"
|
||||||
|
}
|
||||||
|
|
||||||
|
write_unpack_conf(){
|
||||||
|
local conf="$1/unpackfs.conf"
|
||||||
|
msg2 "Writing %s ..." "${conf##*/}"
|
||||||
|
echo "---" > "$conf"
|
||||||
|
echo "unpack:" >> "$conf"
|
||||||
|
echo " - source: \"/run/${iso_name}/bootmnt/${iso_name}/${target_arch}/rootfs.sfs\"" >> "$conf"
|
||||||
|
echo " sourcefs: \"squashfs\"" >> "$conf"
|
||||||
|
echo " destination: \"\"" >> "$conf"
|
||||||
|
if [[ -f "${desktop_list}" ]] ; then
|
||||||
|
echo " - source: \"/run/${iso_name}/bootmnt/${iso_name}/${target_arch}/desktopfs.sfs\"" >> "$conf"
|
||||||
|
echo " sourcefs: \"squashfs\"" >> "$conf"
|
||||||
|
echo " destination: \"\"" >> "$conf"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
configure_calamares(){
|
||||||
|
local dest="$1" mods="$1/etc/calamares/modules"
|
||||||
|
if [[ -d $dest/etc/calamares/modules ]];then
|
||||||
|
info "Configuring [Calamares]"
|
||||||
|
write_netinstall_conf "$mods"
|
||||||
|
write_unpack_conf "$mods"
|
||||||
|
write_users_conf "$mods"
|
||||||
|
write_initcpio_conf "$mods"
|
||||||
|
case ${initsys} in
|
||||||
|
'openrc') write_servicescfg_conf "$mods" ;;
|
||||||
|
esac
|
||||||
|
write_bootloader_conf "$mods"
|
||||||
|
info "Done configuring [Calamares]"
|
||||||
|
fi
|
||||||
|
}
|
336
lib/util-iso.sh
336
lib/util-iso.sh
@@ -10,11 +10,64 @@
|
|||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
import ${LIBDIR}/util-chroot.sh
|
import ${LIBDIR}/util-chroot.sh
|
||||||
import ${LIBDIR}/util-iso-chroot.sh
|
|
||||||
import ${LIBDIR}/util-iso-grub.sh
|
import ${LIBDIR}/util-iso-grub.sh
|
||||||
import ${LIBDIR}/util-yaml.sh
|
import ${LIBDIR}/util-iso-yaml.sh
|
||||||
import ${LIBDIR}/util-iso-mount.sh
|
import ${LIBDIR}/util-iso-profile.sh
|
||||||
import ${LIBDIR}/util-profile.sh
|
|
||||||
|
track_img() {
|
||||||
|
info "mount: [%s]" "$2"
|
||||||
|
mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
|
||||||
|
}
|
||||||
|
|
||||||
|
mount_img() {
|
||||||
|
IMG_ACTIVE_MOUNTS=()
|
||||||
|
mkdir -p "$2"
|
||||||
|
track_img "$1" "$2"
|
||||||
|
}
|
||||||
|
|
||||||
|
umount_img() {
|
||||||
|
if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
|
||||||
|
info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
|
||||||
|
umount "${IMG_ACTIVE_MOUNTS[@]}"
|
||||||
|
unset IMG_ACTIVE_MOUNTS
|
||||||
|
rm -r "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
track_fs() {
|
||||||
|
info "overlayfs mount: [%s]" "$5"
|
||||||
|
mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
|
||||||
|
}
|
||||||
|
|
||||||
|
mount_overlay(){
|
||||||
|
FS_ACTIVE_MOUNTS=()
|
||||||
|
local lower= upper="$1" work="$2" pkglist="$3"
|
||||||
|
local fs=${upper##*/}
|
||||||
|
local rootfs="$work/rootfs" desktopfs="$work/desktopfs" livefs="$work/livefs"
|
||||||
|
mkdir -p "${mnt_dir}/work"
|
||||||
|
mkdir -p "$upper"
|
||||||
|
case $fs in
|
||||||
|
desktopfs) lower="$rootfs" ;;
|
||||||
|
livefs)
|
||||||
|
lower="$rootfs"
|
||||||
|
[[ -f $pkglist ]] && lower="$desktopfs":"$rootfs"
|
||||||
|
;;
|
||||||
|
bootfs)
|
||||||
|
lower="$livefs":"$rootfs"
|
||||||
|
[[ -f $pkglist ]] && lower="$livefs":"$desktopfs":"$rootfs"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
|
||||||
|
}
|
||||||
|
|
||||||
|
umount_overlay(){
|
||||||
|
if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
|
||||||
|
info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
|
||||||
|
umount "${FS_ACTIVE_MOUNTS[@]}"
|
||||||
|
unset FS_ACTIVE_MOUNTS
|
||||||
|
rm -rf "${mnt_dir}/work"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
error_function() {
|
error_function() {
|
||||||
if [[ -p $logpipe ]]; then
|
if [[ -p $logpipe ]]; then
|
||||||
@@ -26,25 +79,22 @@ error_function() {
|
|||||||
error "A failure occurred in %s()." "$func"
|
error "A failure occurred in %s()." "$func"
|
||||||
plain "Aborting..."
|
plain "Aborting..."
|
||||||
fi
|
fi
|
||||||
umount_fs
|
umount_overlay
|
||||||
umount_img
|
umount_img
|
||||||
exit 2
|
exit 2
|
||||||
}
|
}
|
||||||
|
|
||||||
# $1: function
|
# $1: function
|
||||||
run_log(){
|
run_log(){
|
||||||
local func="$1"
|
local func="$1" log_dir='/var/log/artools'
|
||||||
local logfile=${log_dir}/$(gen_iso_fn).$func.log
|
local logfile=${log_dir}/$(gen_iso_fn).$func.log
|
||||||
# local tmpfile=${tmp_dir}/$func.ansi.log
|
logpipe=$(mktemp -u "/tmp/$func.pipe.XXXXXXXX")
|
||||||
logpipe=$(mktemp -u "${tmp_dir}/$func.pipe.XXXXXXXX")
|
|
||||||
mkfifo "$logpipe"
|
mkfifo "$logpipe"
|
||||||
tee "$logfile" < "$logpipe" &
|
tee "$logfile" < "$logpipe" &
|
||||||
local teepid=$!
|
local teepid=$!
|
||||||
$func &> "$logpipe"
|
$func &> "$logpipe"
|
||||||
wait $teepid
|
wait $teepid
|
||||||
rm "$logpipe"
|
rm "$logpipe"
|
||||||
# cat $tmpfile | perl -pe 's/\e\[?.*?[\@-~]//g' > $logfile
|
|
||||||
# rm "$tmpfile"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
run_safe() {
|
run_safe() {
|
||||||
@@ -68,11 +118,127 @@ run_safe() {
|
|||||||
trap_exit() {
|
trap_exit() {
|
||||||
local sig=$1; shift
|
local sig=$1; shift
|
||||||
error "$@"
|
error "$@"
|
||||||
umount_fs
|
umount_overlay
|
||||||
trap -- "$sig"
|
trap -- "$sig"
|
||||||
kill "-$sig" "$$"
|
kill "-$sig" "$$"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
prepare_traps(){
|
||||||
|
for sig in TERM HUP QUIT; do
|
||||||
|
trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
|
||||||
|
done
|
||||||
|
trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
|
||||||
|
# trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
|
||||||
|
}
|
||||||
|
|
||||||
|
add_svc_rc(){
|
||||||
|
local mnt="$1" name="$2" rlvl="$3"
|
||||||
|
if [[ -f $mnt/etc/init.d/$name ]];then
|
||||||
|
msg2 "Setting %s ..." "$name"
|
||||||
|
chroot $mnt rc-update add $name $rlvl &>/dev/null
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
set_xdm(){
|
||||||
|
if [[ -f $1/etc/conf.d/xdm ]];then
|
||||||
|
local conf='DISPLAYMANAGER="'${displaymanager}'"'
|
||||||
|
sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" $1/etc/conf.d/xdm
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
configure_hosts(){
|
||||||
|
sed -e "s|localhost.localdomain|localhost.localdomain ${hostname}|" -i $1/etc/hosts
|
||||||
|
}
|
||||||
|
|
||||||
|
configure_logind(){
|
||||||
|
local conf=$1/etc/$2/logind.conf
|
||||||
|
if [[ -e $conf ]];then
|
||||||
|
msg2 "Configuring logind ..."
|
||||||
|
sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
|
||||||
|
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
|
||||||
|
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
configure_services(){
|
||||||
|
local mnt="$1"
|
||||||
|
info "Configuring [%s]" "${initsys}"
|
||||||
|
case ${initsys} in
|
||||||
|
'openrc')
|
||||||
|
for svc in ${openrc_boot[@]}; do
|
||||||
|
add_svc_rc "$mnt" "$svc" "boot"
|
||||||
|
done
|
||||||
|
for svc in ${openrc_default[@]}; do
|
||||||
|
[[ $svc == "xdm" ]] && set_xdm "$mnt"
|
||||||
|
add_svc_rc "$mnt" "$svc" "default"
|
||||||
|
done
|
||||||
|
for svc in ${enable_live[@]}; do
|
||||||
|
add_svc_rc "$mnt" "$svc" "default"
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
info "Done configuring [%s]" "${initsys}"
|
||||||
|
}
|
||||||
|
|
||||||
|
configure_system(){
|
||||||
|
local mnt="$1"
|
||||||
|
case ${initsys} in
|
||||||
|
'openrc')
|
||||||
|
configure_logind "$mnt" "elogind"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
echo ${hostname} > $mnt/etc/hostname
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_iso_root(){
|
||||||
|
local dest="$1"
|
||||||
|
msg "Deleting isoroot [%s] ..." "${dest##*/}"
|
||||||
|
rm -rf --one-file-system "$dest"
|
||||||
|
}
|
||||||
|
|
||||||
|
clean_up_image(){
|
||||||
|
local path mnt="$1"
|
||||||
|
msg2 "Cleaning [%s]" "${mnt##*/}"
|
||||||
|
|
||||||
|
default_locale "reset" "$mnt"
|
||||||
|
path=$mnt/boot
|
||||||
|
if [[ -d "$path" ]]; then
|
||||||
|
find "$path" -name 'initramfs*.img' -delete &> /dev/null
|
||||||
|
fi
|
||||||
|
path=$mnt/var/lib/pacman/sync
|
||||||
|
if [[ -d $path ]];then
|
||||||
|
find "$path" -type f -delete &> /dev/null
|
||||||
|
fi
|
||||||
|
path=$mnt/var/cache/pacman/pkg
|
||||||
|
if [[ -d $path ]]; then
|
||||||
|
find "$path" -type f -delete &> /dev/null
|
||||||
|
fi
|
||||||
|
path=$mnt/var/log
|
||||||
|
if [[ -d $path ]]; then
|
||||||
|
find "$path" -type f -delete &> /dev/null
|
||||||
|
fi
|
||||||
|
path=$mnt/var/tmp
|
||||||
|
if [[ -d $path ]];then
|
||||||
|
find "$path" -mindepth 1 -delete &> /dev/null
|
||||||
|
fi
|
||||||
|
path=$mnt/tmp
|
||||||
|
if [[ -d $path ]];then
|
||||||
|
find "$path" -mindepth 1 -delete &> /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${mnt##*/} == 'livefs' ]];then
|
||||||
|
rm -rf "$mnt/etc/pacman.d/gnupg"
|
||||||
|
fi
|
||||||
|
|
||||||
|
find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
|
||||||
|
if [[ -f "$mnt/boot/grub/grub.cfg" ]]; then
|
||||||
|
rm $mnt/boot/grub/grub.cfg
|
||||||
|
fi
|
||||||
|
if [[ -f "$mnt/etc/machine-id" ]]; then
|
||||||
|
rm $mnt/etc/machine-id
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
configure_live_image(){
|
configure_live_image(){
|
||||||
local fs="$1"
|
local fs="$1"
|
||||||
msg "Configuring [livefs]"
|
msg "Configuring [livefs]"
|
||||||
@@ -96,9 +262,9 @@ make_sig () {
|
|||||||
|
|
||||||
make_checksum(){
|
make_checksum(){
|
||||||
local idir="$1" file="$2"
|
local idir="$1" file="$2"
|
||||||
msg2 "Creating md5sum ..."
|
msg2 "Creating sha512sum ..."
|
||||||
cd $idir
|
cd $idir
|
||||||
md5sum $file.sfs > $file.md5
|
sha512sum $file.sfs > $file.sha512
|
||||||
cd ${OLDPWD}
|
cd ${OLDPWD}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,15 +275,15 @@ make_sfs() {
|
|||||||
error "The path %s does not exist" "${src}"
|
error "The path %s does not exist" "${src}"
|
||||||
retrun 1
|
retrun 1
|
||||||
fi
|
fi
|
||||||
local timer=$(get_timer) dest=${iso_root}/${os_id}/${target_arch}
|
local timer=$(get_timer) dest=${iso_root}/${iso_name}/${target_arch}
|
||||||
local name=${1##*/}
|
local name=${1##*/}
|
||||||
local sfs="${dest}/${name}.sfs"
|
local sfs="${dest}/${name}.sfs"
|
||||||
mkdir -p ${dest}
|
mkdir -p ${dest}
|
||||||
msg "Generating SquashFS image for %s" "${src}"
|
msg "Generating SquashFS image for %s" "${src}"
|
||||||
if [[ -f "${sfs}" ]]; then
|
if [[ -f "${sfs}" ]]; then
|
||||||
local has_changed_dir=$(find ${src} -newer ${sfs})
|
local has_changed_dir=$(find ${src} -newer ${sfs})
|
||||||
msg2 "Possible changes for %s ..." "${src}" >> ${tmp_dir}/buildiso.debug
|
msg2 "Possible changes for %s ..." "${src}" >> /tmp/buildiso.debug
|
||||||
msg2 "%s" "${has_changed_dir}" >> ${tmp_dir}/buildiso.debug
|
msg2 "%s" "${has_changed_dir}" >> /tmp/buildiso.debug
|
||||||
if [[ -n "${has_changed_dir}" ]]; then
|
if [[ -n "${has_changed_dir}" ]]; then
|
||||||
msg2 "SquashFS image %s is not up to date, rebuilding..." "${sfs}"
|
msg2 "SquashFS image %s is not up to date, rebuilding..." "${sfs}"
|
||||||
rm "${sfs}"
|
rm "${sfs}"
|
||||||
@@ -179,7 +345,7 @@ assemble_iso(){
|
|||||||
xorriso -as mkisofs \
|
xorriso -as mkisofs \
|
||||||
--modification-date=${mod_date} \
|
--modification-date=${mod_date} \
|
||||||
--protective-msdos-label \
|
--protective-msdos-label \
|
||||||
-volid "${dist_branding}" \
|
-volid "${iso_label}" \
|
||||||
-appid "$(get_osname) Live/Rescue CD" \
|
-appid "$(get_osname) Live/Rescue CD" \
|
||||||
-publisher "$(get_osname) <$(get_disturl)>" \
|
-publisher "$(get_osname) <$(get_disturl)>" \
|
||||||
-preparer "Prepared by artools/${0##*/}" \
|
-preparer "Prepared by artools/${0##*/}" \
|
||||||
@@ -193,14 +359,11 @@ assemble_iso(){
|
|||||||
-no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info \
|
-no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info \
|
||||||
-eltorito-alt-boot \
|
-eltorito-alt-boot \
|
||||||
-append_partition 2 0xef ${iso_root}/efi.img \
|
-append_partition 2 0xef ${iso_root}/efi.img \
|
||||||
-e --interval:appended_partition_2:all:: \
|
-e --interval:appended_partition_2:all:: -iso_mbr_part_type 0x00 \
|
||||||
-no-emul-boot \
|
-no-emul-boot \
|
||||||
-iso-level 3 \
|
-iso-level 3 \
|
||||||
-o ${iso_dir}/${iso_file} \
|
-o ${iso_dir}/${iso_file} \
|
||||||
${iso_root}/
|
${iso_root}/
|
||||||
|
|
||||||
# arg to add with xorriso-1.4.7
|
|
||||||
# -iso_mbr_part_type 0x00
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Build ISO
|
# Build ISO
|
||||||
@@ -226,9 +389,9 @@ make_iso() {
|
|||||||
|
|
||||||
gen_iso_fn(){
|
gen_iso_fn(){
|
||||||
local vars=() name
|
local vars=() name
|
||||||
vars+=("${os_id}")
|
vars+=("${iso_name}")
|
||||||
vars+=("${profile}")
|
vars+=("${profile}")
|
||||||
vars+=("${dist_release}")
|
vars+=("${iso_version}")
|
||||||
vars+=("${target_arch}")
|
vars+=("${target_arch}")
|
||||||
for n in ${vars[@]};do
|
for n in ${vars[@]};do
|
||||||
name=${name:-}${name:+-}${n}
|
name=${name:-}${name:+-}${n}
|
||||||
@@ -236,6 +399,12 @@ gen_iso_fn(){
|
|||||||
echo $name
|
echo $name
|
||||||
}
|
}
|
||||||
|
|
||||||
|
install_packages(){
|
||||||
|
local fs="$1"
|
||||||
|
setarch "${target_arch}" mkchroot \
|
||||||
|
"${mkchroot_args[@]}" "${fs}" "${packages[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
copy_overlay(){
|
copy_overlay(){
|
||||||
local src="$1" dest="$2"
|
local src="$1" dest="$2"
|
||||||
if [[ -e "$src" ]];then
|
if [[ -e "$src" ]];then
|
||||||
@@ -244,56 +413,53 @@ copy_overlay(){
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Base installation (rootfs)
|
make_rootfs() {
|
||||||
make_image_root() {
|
|
||||||
if [[ ! -e ${work_dir}/rootfs.lock ]]; then
|
if [[ ! -e ${work_dir}/rootfs.lock ]]; then
|
||||||
msg "Prepare [Base installation] (rootfs)"
|
msg "Prepare [Base installation] (rootfs)"
|
||||||
local rootfs="${work_dir}/rootfs"
|
local rootfs="${work_dir}/rootfs"
|
||||||
|
|
||||||
prepare_dir "${rootfs}"
|
prepare_dir "${rootfs}"
|
||||||
|
|
||||||
create_chroot "${mkchroot_args[@]}" "${rootfs}" "${packages[@]}"
|
install_packages "${rootfs}"
|
||||||
|
|
||||||
copy_overlay "${root_overlay}" "${rootfs}"
|
copy_overlay "${root_overlay}" "${rootfs}"
|
||||||
|
|
||||||
configure_lsb "${rootfs}"
|
|
||||||
|
|
||||||
clean_up_image "${rootfs}"
|
clean_up_image "${rootfs}"
|
||||||
|
|
||||||
msg "Done [Base installation] (rootfs)"
|
msg "Done [Base installation] (rootfs)"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
make_image_desktop() {
|
make_desktopfs() {
|
||||||
if [[ ! -e ${work_dir}/desktopfs.lock ]]; then
|
if [[ ! -e ${work_dir}/desktopfs.lock ]]; then
|
||||||
msg "Prepare [Desktop installation] (desktopfs)"
|
msg "Prepare [Desktop installation] (desktopfs)"
|
||||||
local desktopfs="${work_dir}/desktopfs"
|
local desktopfs="${work_dir}/desktopfs"
|
||||||
|
|
||||||
prepare_dir "${desktopfs}"
|
prepare_dir "${desktopfs}"
|
||||||
|
|
||||||
mount_fs "${desktopfs}" "${work_dir}"
|
mount_overlay "${desktopfs}" "${work_dir}"
|
||||||
|
|
||||||
create_chroot "${mkchroot_args[@]}" "${desktopfs}" "${packages[@]}"
|
install_packages "${desktopfs}"
|
||||||
|
|
||||||
copy_overlay "${desktop_overlay}" "${desktopfs}"
|
copy_overlay "${desktop_overlay}" "${desktopfs}"
|
||||||
|
|
||||||
umount_fs
|
umount_overlay
|
||||||
clean_up_image "${desktopfs}"
|
clean_up_image "${desktopfs}"
|
||||||
|
|
||||||
msg "Done [Desktop installation] (desktopfs)"
|
msg "Done [Desktop installation] (desktopfs)"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
make_image_live() {
|
make_livefs() {
|
||||||
if [[ ! -e ${work_dir}/livefs.lock ]]; then
|
if [[ ! -e ${work_dir}/livefs.lock ]]; then
|
||||||
msg "Prepare [Live installation] (livefs)"
|
msg "Prepare [Live installation] (livefs)"
|
||||||
local livefs="${work_dir}/livefs"
|
local livefs="${work_dir}/livefs"
|
||||||
|
|
||||||
prepare_dir "${livefs}"
|
prepare_dir "${livefs}"
|
||||||
|
|
||||||
mount_fs "${livefs}" "${work_dir}" "${desktop_list}"
|
mount_overlay "${livefs}" "${work_dir}" "${desktop_list}"
|
||||||
|
|
||||||
create_chroot "${mkchroot_args[@]}" "${livefs}" "${packages[@]}"
|
install_packages "${livefs}"
|
||||||
|
|
||||||
copy_overlay "${live_overlay}" "${livefs}"
|
copy_overlay "${live_overlay}" "${livefs}"
|
||||||
|
|
||||||
@@ -301,7 +467,7 @@ make_image_live() {
|
|||||||
|
|
||||||
pacman -Qr "${livefs}" > ${iso_dir}/$(gen_iso_fn)-pkgs.txt
|
pacman -Qr "${livefs}" > ${iso_dir}/$(gen_iso_fn)-pkgs.txt
|
||||||
|
|
||||||
umount_fs
|
umount_overlay
|
||||||
|
|
||||||
clean_up_image "${livefs}"
|
clean_up_image "${livefs}"
|
||||||
|
|
||||||
@@ -309,7 +475,7 @@ make_image_live() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
make_image_boot() {
|
make_bootfs() {
|
||||||
if [[ ! -e ${work_dir}/bootfs.lock ]]; then
|
if [[ ! -e ${work_dir}/bootfs.lock ]]; then
|
||||||
msg "Prepare [/iso/boot]"
|
msg "Prepare [/iso/boot]"
|
||||||
local boot="${iso_root}/boot"
|
local boot="${iso_root}/boot"
|
||||||
@@ -320,7 +486,7 @@ make_image_boot() {
|
|||||||
|
|
||||||
local bootfs="${work_dir}/bootfs"
|
local bootfs="${work_dir}/bootfs"
|
||||||
|
|
||||||
mount_fs "${bootfs}" "${work_dir}" "${desktop_list}"
|
mount_overlay "${bootfs}" "${work_dir}" "${desktop_list}"
|
||||||
|
|
||||||
prepare_initcpio "${bootfs}"
|
prepare_initcpio "${bootfs}"
|
||||||
prepare_initramfs "${bootfs}"
|
prepare_initramfs "${bootfs}"
|
||||||
@@ -328,7 +494,7 @@ make_image_boot() {
|
|||||||
cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${target_arch}.img
|
cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${target_arch}.img
|
||||||
prepare_boot_extras "${bootfs}" "${boot}"
|
prepare_boot_extras "${bootfs}" "${boot}"
|
||||||
|
|
||||||
umount_fs
|
umount_overlay
|
||||||
|
|
||||||
rm -R ${bootfs}
|
rm -R ${bootfs}
|
||||||
: > ${work_dir}/bootfs.lock
|
: > ${work_dir}/bootfs.lock
|
||||||
@@ -336,23 +502,6 @@ make_image_boot() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
configure_grub(){
|
|
||||||
local conf="$1"
|
|
||||||
local default_args="artixbasedir=${os_id} artixlabel=${dist_branding}" boot_args=('quiet')
|
|
||||||
|
|
||||||
sed -e "s|@DIST_NAME@|${dist_name}|g" \
|
|
||||||
-e "s|@ARCH@|${target_arch}|g" \
|
|
||||||
-e "s|@DEFAULT_ARGS@|${default_args}|g" \
|
|
||||||
-e "s|@BOOT_ARGS@|${boot_args[*]}|g" \
|
|
||||||
-e "s|@PROFILE@|${profile}|g" \
|
|
||||||
-i $conf
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_grub_theme(){
|
|
||||||
local conf="$1"
|
|
||||||
sed -e "s|@DIST@|${os_id}|" -i "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
make_grub(){
|
make_grub(){
|
||||||
if [[ ! -e ${work_dir}/grub.lock ]]; then
|
if [[ ! -e ${work_dir}/grub.lock ]]; then
|
||||||
msg "Prepare [/iso/boot/grub]"
|
msg "Prepare [/iso/boot/grub]"
|
||||||
@@ -360,7 +509,6 @@ make_grub(){
|
|||||||
prepare_grub "${work_dir}/rootfs" "${work_dir}/livefs" "${iso_root}"
|
prepare_grub "${work_dir}/rootfs" "${work_dir}/livefs" "${iso_root}"
|
||||||
|
|
||||||
configure_grub "${iso_root}/boot/grub/kernels.cfg"
|
configure_grub "${iso_root}/boot/grub/kernels.cfg"
|
||||||
configure_grub_theme "${iso_root}/boot/grub/variable.cfg"
|
|
||||||
|
|
||||||
: > ${work_dir}/grub.lock
|
: > ${work_dir}/grub.lock
|
||||||
msg "Done [/iso/boot/grub]"
|
msg "Done [/iso/boot/grub]"
|
||||||
@@ -376,78 +524,18 @@ compress_images(){
|
|||||||
|
|
||||||
prepare_images(){
|
prepare_images(){
|
||||||
local timer=$(get_timer)
|
local timer=$(get_timer)
|
||||||
load_pkgs "${root_list}" "${target_arch}" "${initsys}" "${kernel}"
|
load_pkgs "${root_list}" "${initsys}" "${kernel}"
|
||||||
run_safe "make_image_root"
|
run_safe "make_rootfs"
|
||||||
if [[ -f "${desktop_list}" ]] ; then
|
if [[ -f "${desktop_list}" ]] ; then
|
||||||
load_pkgs "${desktop_list}" "${target_arch}" "${initsys}" "${kernel}"
|
load_pkgs "${desktop_list}" "${initsys}" "${kernel}"
|
||||||
run_safe "make_image_desktop"
|
run_safe "make_desktopfs"
|
||||||
fi
|
fi
|
||||||
if [[ -f ${live_list} ]]; then
|
if [[ -f ${live_list} ]]; then
|
||||||
load_pkgs "${live_list}" "${target_arch}" "${initsys}" "${kernel}"
|
load_pkgs "${live_list}" "${initsys}" "${kernel}"
|
||||||
run_safe "make_image_live"
|
run_safe "make_livefs"
|
||||||
fi
|
fi
|
||||||
run_safe "make_image_boot"
|
run_safe "make_bootfs"
|
||||||
run_safe "make_grub"
|
run_safe "make_grub"
|
||||||
|
|
||||||
show_elapsed_time "${FUNCNAME}" "${timer}"
|
show_elapsed_time "${FUNCNAME}" "${timer}"
|
||||||
}
|
}
|
||||||
|
|
||||||
check_requirements(){
|
|
||||||
[[ -f ${run_dir}/repo_info ]] || die "%s is not a valid iso profiles directory!" "${run_dir}"
|
|
||||||
|
|
||||||
for sig in TERM HUP QUIT; do
|
|
||||||
trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
|
|
||||||
done
|
|
||||||
trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
|
|
||||||
trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
|
|
||||||
}
|
|
||||||
|
|
||||||
prepare_build(){
|
|
||||||
timer_start=$(get_timer)
|
|
||||||
local profile_dir=${run_dir}/${profile}
|
|
||||||
|
|
||||||
load_profile "${profile_dir}"
|
|
||||||
|
|
||||||
local pac_arch='default' pacman_conf
|
|
||||||
[[ "${target_arch}" == 'x86_64' ]] && pac_arch='multilib'
|
|
||||||
|
|
||||||
pacman_conf="${DATADIR}/pacman-$pac_arch.conf"
|
|
||||||
|
|
||||||
iso_file=$(gen_iso_fn).iso
|
|
||||||
|
|
||||||
mkchroot_args+=(-C ${pacman_conf})
|
|
||||||
work_dir=${chroots_iso}/${profile}/${target_arch}
|
|
||||||
|
|
||||||
iso_dir="${cache_dir_iso}/${profile}"
|
|
||||||
|
|
||||||
iso_root=${chroots_iso}/${profile}/iso
|
|
||||||
mnt_dir=${chroots_iso}/${profile}/mnt
|
|
||||||
prepare_dir "${mnt_dir}"
|
|
||||||
prepare_dir "${iso_dir}"
|
|
||||||
}
|
|
||||||
|
|
||||||
build(){
|
|
||||||
prepare_build
|
|
||||||
msg "Start building [%s]" "${profile}"
|
|
||||||
if ${clean_first};then
|
|
||||||
chroot_clean "${chroots_iso}/${profile}/${target_arch}"
|
|
||||||
clean_iso_root "${iso_root}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ${iso_only}; then
|
|
||||||
[[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
|
|
||||||
compress_images
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if ${images_only}; then
|
|
||||||
prepare_images
|
|
||||||
warning "Continue compress: buildiso -p %s -zc ..." "${profile}"
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
prepare_images
|
|
||||||
compress_images
|
|
||||||
fi
|
|
||||||
reset_profile
|
|
||||||
msg "Finished building [%s]" "${profile}"
|
|
||||||
show_elapsed_time "${FUNCNAME}" "${timer_start}"
|
|
||||||
}
|
|
||||||
|
@@ -8,61 +8,22 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
export LC_MESSAGES=C
|
# export LC_MESSAGES=C
|
||||||
export LANG=C
|
export LANG=C
|
||||||
|
|
||||||
declare ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
|
source /usr/share/makepkg/util.sh
|
||||||
|
|
||||||
if [[ -t 2 ]]; then
|
if [[ -t 2 ]]; then
|
||||||
# prefer terminal safe colored and bold text when tput is supported
|
colorize
|
||||||
if tput setaf 0 &>/dev/null; then
|
else
|
||||||
ALL_OFF="$(tput sgr0)"
|
declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
|
||||||
BOLD="$(tput bold)"
|
|
||||||
RED="${BOLD}$(tput setaf 1)"
|
|
||||||
GREEN="${BOLD}$(tput setaf 2)"
|
|
||||||
YELLOW="${BOLD}$(tput setaf 3)"
|
|
||||||
BLUE="${BOLD}$(tput setaf 4)"
|
|
||||||
else
|
|
||||||
ALL_OFF="\e[0m"
|
|
||||||
BOLD="\e[1m"
|
|
||||||
RED="${BOLD}\e[31m"
|
|
||||||
GREEN="${BOLD}\e[32m"
|
|
||||||
YELLOW="${BOLD}\e[33m"
|
|
||||||
BLUE="${BOLD}\e[34m"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
|
|
||||||
|
|
||||||
plain() {
|
|
||||||
local mesg=$1; shift
|
|
||||||
printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
|
||||||
}
|
|
||||||
|
|
||||||
msg() {
|
|
||||||
local mesg=$1; shift
|
|
||||||
printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
|
||||||
}
|
|
||||||
|
|
||||||
msg2() {
|
|
||||||
local mesg=$1; shift
|
|
||||||
printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
|
||||||
}
|
|
||||||
|
|
||||||
info() {
|
info() {
|
||||||
local mesg=$1; shift
|
local mesg=$1; shift
|
||||||
printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
||||||
}
|
}
|
||||||
|
|
||||||
warning() {
|
|
||||||
local mesg=$1; shift
|
|
||||||
printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
|
||||||
}
|
|
||||||
|
|
||||||
error() {
|
|
||||||
local mesg=$1; shift
|
|
||||||
printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
|
||||||
}
|
|
||||||
|
|
||||||
stat_busy() {
|
stat_busy() {
|
||||||
local mesg=$1; shift
|
local mesg=$1; shift
|
||||||
printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
|
printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
|
||||||
@@ -115,6 +76,21 @@ die() {
|
|||||||
cleanup 255
|
cleanup 255
|
||||||
}
|
}
|
||||||
|
|
||||||
|
msg_table_header(){
|
||||||
|
local mesg=$1; shift
|
||||||
|
printf "${GREEN} ${mesg} ${ALL_OFF}\n" "$@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
msg_row(){
|
||||||
|
local mesg=$1; shift
|
||||||
|
printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
msg_row_update(){
|
||||||
|
local mesg=$1; shift
|
||||||
|
printf "${RED}${BOLD} ${mesg} ${ALL_OFF}\n" "$@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
import(){
|
import(){
|
||||||
if [[ -r "$1" ]];then
|
if [[ -r "$1" ]];then
|
||||||
source "$1"
|
source "$1"
|
||||||
|
@@ -1,108 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; version 2 of the License.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
|
|
||||||
load_compiler_settings(){
|
|
||||||
local arch="$1" conf
|
|
||||||
conf=${make_conf_dir}/$arch.conf
|
|
||||||
|
|
||||||
[[ -f $conf ]] || return 1
|
|
||||||
|
|
||||||
info "Loading compiler settings: %s" "$arch"
|
|
||||||
source $conf
|
|
||||||
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
get_makepkg_conf(){
|
|
||||||
|
|
||||||
local arch="$1"
|
|
||||||
local conf="${tmp_dir}/makepkg-${arch}.conf"
|
|
||||||
|
|
||||||
if [[ -f $AT_USERCONFDIR/makepkg.conf ]];then
|
|
||||||
cp "$AT_USERCONFDIR/makepkg.conf" "$conf"
|
|
||||||
else
|
|
||||||
cp "${DATADIR}/makepkg.conf" "$conf"
|
|
||||||
fi
|
|
||||||
|
|
||||||
load_compiler_settings "${arch}"
|
|
||||||
|
|
||||||
sed -i "$conf" \
|
|
||||||
-e "s|@CARCH[@]|$carch|g" \
|
|
||||||
-e "s|@CHOST[@]|$chost|g" \
|
|
||||||
-e "s|@CFLAGS[@]|$cflags|g"
|
|
||||||
|
|
||||||
echo "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
check_build(){
|
|
||||||
local bdir="$1"
|
|
||||||
find_pkg "${bdir}"
|
|
||||||
[[ ! -f ${bdir}/PKGBUILD ]] && die "Directory must contain a PKGBUILD!"
|
|
||||||
}
|
|
||||||
|
|
||||||
find_pkg(){
|
|
||||||
local bdir="$1"
|
|
||||||
local result=$(find . -type d -name "${bdir}")
|
|
||||||
[[ -z $result ]] && die "%s is not a valid package!" "${bdir}"
|
|
||||||
}
|
|
||||||
|
|
||||||
sign_pkg(){
|
|
||||||
local pkg="$1"
|
|
||||||
[[ -f ${pkg_dir}/${pkg}.sig ]] && rm ${pkg_dir}/${pkg}.sig
|
|
||||||
user_run "signfile ${pkg_dir}/${pkg}"
|
|
||||||
}
|
|
||||||
|
|
||||||
move_to_cache(){
|
|
||||||
local src="$1"
|
|
||||||
[[ -n $PKGDEST ]] && src="$PKGDEST/$src"
|
|
||||||
[[ ! -f $src ]] && die
|
|
||||||
msg2 "Moving [%s] -> [%s]" "${src##*/}" "${pkg_dir}"
|
|
||||||
mv $src ${pkg_dir}/
|
|
||||||
user_own "${pkg_dir}" -R
|
|
||||||
${sign} && sign_pkg "${src##*/}"
|
|
||||||
# [[ -n $PKGDEST ]] && rm "$src"
|
|
||||||
user_own "${pkg_dir}" -R
|
|
||||||
}
|
|
||||||
|
|
||||||
post_build(){
|
|
||||||
source PKGBUILD
|
|
||||||
local ext='pkg.tar.xz' tarch ver src
|
|
||||||
for pkg in ${pkgname[@]};do
|
|
||||||
case $arch in
|
|
||||||
any) tarch='any' ;;
|
|
||||||
*) tarch=${target_arch}
|
|
||||||
esac
|
|
||||||
local ver=$(get_full_version "$pkg") src
|
|
||||||
src=$pkg-$ver-$tarch.$ext
|
|
||||||
move_to_cache "$src"
|
|
||||||
if ${repo_add};then
|
|
||||||
deploypkg "${deploypkg_args[@]}" -p "$src"
|
|
||||||
user_own "${repos_local}/${repository}" -R
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
build_pkg(){
|
|
||||||
mkchrootpkg "${mkchrootpkg_args[@]}" || die
|
|
||||||
post_build
|
|
||||||
}
|
|
||||||
|
|
||||||
build(){
|
|
||||||
local pkg="$1"
|
|
||||||
check_build "${pkg}"
|
|
||||||
msg "Start building [%s]" "${pkg}"
|
|
||||||
cd ${pkg}
|
|
||||||
build_pkg
|
|
||||||
cd ..
|
|
||||||
msg "Finished building [%s]" "${pkg}"
|
|
||||||
show_elapsed_time "${FUNCNAME}" "${timer_start}"
|
|
||||||
}
|
|
||||||
|
|
@@ -9,67 +9,65 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
repo_update(){
|
import ${LIBDIR}/util-pkg.sh
|
||||||
local repo="$1" arch="$2" pkg="$3" action="$4" copy="$5"
|
|
||||||
if [[ $action == "add" ]];then
|
del_from_repo(){
|
||||||
if [[ -f ${repos_local}/$repo/os/$arch/$pkg \
|
local repo="$1" destarch="$2" pkg="$3" ver result
|
||||||
&& -f ${repos_local}/$repo/os/$arch/$pkg.sig ]];then
|
local repo_path=${repos_root}/$repo/os/$destarch
|
||||||
rm ${repos_local}/$repo/os/$arch/$pkg
|
source $pkg/PKGBUILD
|
||||||
rm ${repos_local}/$repo/os/$arch/$pkg.sig
|
for name in ${pkgname[@]};do
|
||||||
|
[[ $arch == any ]] && CARCH=any
|
||||||
|
ver=$(get_full_version $name)
|
||||||
|
if ! result=$(find_cached_package "$name" "$ver" "$CARCH");then
|
||||||
|
cd $repo_path
|
||||||
|
repo-remove -R $repo.db.tar.xz $name
|
||||||
fi
|
fi
|
||||||
local cmd='ln -s'
|
done
|
||||||
$copy && cmd='cp'
|
|
||||||
$cmd ${cache_dir_pkg}/$arch/$repo/$pkg{,.sig} ${repos_local}/$repo/os/$arch/
|
|
||||||
fi
|
|
||||||
local dest=${repos_local}/$repo/os/$arch/$pkg
|
|
||||||
[[ $action == "remove" ]] && dest=$pkg
|
|
||||||
repo-$action -R ${repos_local}/$repo/os/$arch/$repo.db.tar.xz $dest
|
|
||||||
}
|
}
|
||||||
|
|
||||||
update_lock(){
|
move_to_repo(){
|
||||||
local repo="$1"
|
local repo_src="$1" repo_dest="$2" repo_arch="$3"
|
||||||
rsync "${rsync_args[@]}" --exclude='os' "${repos_local}/$repo/" "$(connect)${repos_remote}/$repo/"
|
local repo_path=${repos_root}/$repo_src/os/$repo_arch
|
||||||
|
local src=$PWD
|
||||||
|
local filelist=${workspace_dir}/$repo_src.files.txt
|
||||||
|
local pkglist=${workspace_dir}/$repo_src.pkgs.txt
|
||||||
|
[[ -n ${PKGDEST} ]] && src=${PKGDEST}
|
||||||
|
cd $repo_path
|
||||||
|
msg "Writing repo lists [%s]" "$repo_src"
|
||||||
|
ls *.pkg.tar.xz{,.sig} > $filelist
|
||||||
|
ls *.pkg.tar.xz > $pkglist
|
||||||
|
rm -v *
|
||||||
|
repo-add $repo_src.db.tar.xz
|
||||||
|
repo_path=${repos_root}/$repo_dest/os/$repo_arch
|
||||||
|
local move=$(cat $filelist) pkgs=$(cat $pkglist)
|
||||||
|
msg "Reading repo lists [%s]" "$repo_dest"
|
||||||
|
for f in ${move[@]};do
|
||||||
|
ln -sfv $src/$f $repo_path/
|
||||||
|
done
|
||||||
|
cd $repo_path
|
||||||
|
repo-add -R $repo_dest.db.tar.xz ${pkgs[@]}
|
||||||
}
|
}
|
||||||
|
|
||||||
is_locked(){
|
add_to_repo(){
|
||||||
local repo="$1" url="https://${host}/projects/${project}/files/repos"
|
local repo="$1" destarch="$2" pkg="$3" ver pkgfile=
|
||||||
if wget --spider -v $url/$repo/$repo.lock &>/dev/null;then
|
local repo_path=${repos_root}/$repo/os/$destarch
|
||||||
return 0
|
source $pkg/PKGBUILD
|
||||||
else
|
for name in ${pkgname[@]};do
|
||||||
return 1
|
info "finddeps: %s" "$name"
|
||||||
fi
|
finddeps $name
|
||||||
|
[[ $arch == any ]] && CARCH=any
|
||||||
|
ver=$(get_full_version $name)
|
||||||
|
if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH"); then
|
||||||
|
info "find-libdeps: %s" "$pkgfile"
|
||||||
|
find-libdeps "$pkgfile"
|
||||||
|
info "find-libprovides: %s" "$pkgfile"
|
||||||
|
find-libprovides "$pkgfile"
|
||||||
|
[[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
|
||||||
|
signfile ${pkgfile}
|
||||||
|
ln -sf ${pkgfile}{,.sig} $repo_path/
|
||||||
|
cd $repo_path
|
||||||
|
repo-add -R $repo.db.tar.xz ${pkgfile##*/}
|
||||||
|
fi
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
repo_lock(){
|
|
||||||
local repo="$1"
|
|
||||||
if [[ ! -f ${repos_local}/$repo/$repo.lock ]];then
|
|
||||||
warning "Locking %s" "$repo"
|
|
||||||
touch ${repos_local}/$repo/$repo.lock
|
|
||||||
update_lock "$repo"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
repo_unlock(){
|
|
||||||
local repo="$1"
|
|
||||||
if [[ -f ${repos_local}/$repo/$repo.lock ]];then
|
|
||||||
warning "Unlocking %s" "$repo"
|
|
||||||
rm ${repos_local}/$repo/$repo.lock
|
|
||||||
update_lock "$repo"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
repo_download(){
|
|
||||||
local repo="$1"
|
|
||||||
if is_locked "$repo"; then
|
|
||||||
die "The '%s' repository is locked" "$repo"
|
|
||||||
else
|
|
||||||
rsync "${rsync_args[@]}" "$(connect)${repos_remote}/$repo/" "${repos_local}/$repo/"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
repo_upload(){
|
|
||||||
local repo="$1"
|
|
||||||
repo_lock "$repo"
|
|
||||||
rsync "${rsync_args[@]}" "${repos_local}/$repo/" "$(connect)${repos_remote}/$repo/"
|
|
||||||
repo_unlock "$repo"
|
|
||||||
}
|
|
||||||
|
@@ -24,6 +24,7 @@ is_dirty() {
|
|||||||
|
|
||||||
sync_tree(){
|
sync_tree(){
|
||||||
local branch="master" repo="$1"
|
local branch="master" repo="$1"
|
||||||
|
git checkout $branch
|
||||||
local local_head=$(get_local_head "$branch")
|
local local_head=$(get_local_head "$branch")
|
||||||
local remote_head=$(get_remote_head "$branch")
|
local remote_head=$(get_remote_head "$branch")
|
||||||
local timer=$(get_timer)
|
local timer=$(get_timer)
|
||||||
@@ -50,6 +51,7 @@ clone_tree(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
sync_tree_arch(){
|
sync_tree_arch(){
|
||||||
|
local repo="$1"
|
||||||
cd ${tree_dir_arch}
|
cd ${tree_dir_arch}
|
||||||
for repo in ${repo_tree_arch[@]};do
|
for repo in ${repo_tree_arch[@]};do
|
||||||
if [[ -d ${repo} ]];then
|
if [[ -d ${repo} ]];then
|
||||||
@@ -63,15 +65,25 @@ sync_tree_arch(){
|
|||||||
cd ..
|
cd ..
|
||||||
}
|
}
|
||||||
|
|
||||||
read_import_list(){
|
sync_tree_artix(){
|
||||||
local name="$1"
|
local repo="$1"
|
||||||
local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
|
cd ${tree_dir_artix}
|
||||||
import_list=$(sed "$_com_rm" "${list_dir_import}/$name.list" | sed "$_space" | sed "$_clean")
|
for repo in ${repo_tree_artix[@]};do
|
||||||
|
if [[ -d ${repo} ]];then
|
||||||
|
cd ${repo}
|
||||||
|
sync_tree "${repo}"
|
||||||
|
cd ..
|
||||||
|
else
|
||||||
|
clone_tree "${repo}" "${host_tree_artix}/${repo}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
cd ..
|
||||||
}
|
}
|
||||||
|
|
||||||
get_pkgver(){
|
read_import_list(){
|
||||||
source PKGBUILD
|
local repo="$1"
|
||||||
echo $pkgver-$pkgrel
|
local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
|
||||||
|
import_list=$(sed "$_com_rm" "${list_dir_import}/$repo.list" | sed "$_space" | sed "$_clean")
|
||||||
}
|
}
|
||||||
|
|
||||||
is_untracked(){
|
is_untracked(){
|
||||||
@@ -79,30 +91,123 @@ is_untracked(){
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
import_from_arch(){
|
patch_pkg(){
|
||||||
local timer=$(get_timer) branch='testing'
|
local pkg="$1"
|
||||||
for repo in ${repo_tree_import[@]};do
|
case $pkg in
|
||||||
read_import_list "$repo"
|
'glibc')
|
||||||
if [[ -n ${import_list[@]} ]];then
|
sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
|
||||||
cd ${tree_dir_artix}/$repo
|
-e '/nscd.service/d' \
|
||||||
git checkout $branch &> /dev/null
|
-i $pkg/PKGBUILD
|
||||||
$(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
|
;;
|
||||||
git pull origin $branch &> /dev/null
|
'bash')
|
||||||
local arch_dir=packages
|
sed -e 's|system.bash_logout)|system.bash_logout\n artix.bashrc)|' \
|
||||||
[[ $repo == "galaxy" ]] && arch_dir=community
|
-e 's|etc/bash.|etc/bash/|g' \
|
||||||
msg "Import into [%s]" "$repo"
|
-e 's|install -dm755 "$pkgdir"/etc/skel/|install -dm755 "$pkgdir"/etc/{skel,bash/bashrc.d}/|' \
|
||||||
for pkg in ${import_list[@]};do
|
-e 's|/etc/skel/.bash_logout|/etc/skel/.bash_logout\n install -m644 artix.bashrc "$pkgdir"/etc/bash/bashrc.d/artix.bashrc|' \
|
||||||
rsync "${rsync_args[@]}" ${tree_dir_arch}/$arch_dir/$pkg/trunk/ ${tree_dir_artix}/$repo/$pkg/
|
-i $pkg/PKGBUILD
|
||||||
if $(is_dirty) || $(is_untracked); then
|
|
||||||
git add $pkg
|
patch -p1 -i $DATADIR/patches/dot-bashrc.patch
|
||||||
cd $pkg
|
patch -p1 -i $DATADIR/patches/system-bashrc.patch
|
||||||
local ver=$(get_pkgver)
|
patch -p1 -i $DATADIR/patches/system-bashrc_logout.patch
|
||||||
msg2 "Archlinux import: [%s]" "$pkg-$ver"
|
patch -p1 -i $DATADIR/patches/artix-bashrc.patch
|
||||||
git commit -m "Archlinux import: $pkg-$ver"
|
cd $pkg
|
||||||
cd ..
|
updpkgsums
|
||||||
fi
|
cd ..
|
||||||
done
|
;;
|
||||||
|
'tp_smapi'|'acpi_call'|'r8168')
|
||||||
|
sed -e 's|-ARCH|-ARTIX|g' -i $pkg/PKGBUILD
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
get_import_path(){
|
||||||
|
local arch_dir arch_repo import_path
|
||||||
|
local repo="$1" pkg="$2" src=
|
||||||
|
case $repo in
|
||||||
|
system|world)
|
||||||
|
arch_dir=packages
|
||||||
|
[[ "$repo" == 'system' ]] && arch_repo=core
|
||||||
|
[[ "$repo" == 'world' ]] && arch_repo=extra
|
||||||
|
import_path=${tree_dir_arch}/$arch_dir/$pkg/repos
|
||||||
|
src=$import_path/$arch_repo-x86_64
|
||||||
|
[[ -d $import_path/testing-x86_64 ]] && src=$import_path/testing-x86_64
|
||||||
|
[[ -d $import_path/$arch_repo-any ]] && src=$import_path/$arch_repo-any
|
||||||
|
[[ -d $import_path/testing-any ]] && src=$import_path/testing-any
|
||||||
|
;;
|
||||||
|
galaxy)
|
||||||
|
arch_repo=community
|
||||||
|
arch_dir=$arch_repo
|
||||||
|
import_path=${tree_dir_arch}/$arch_dir/$pkg/repos/$arch_repo
|
||||||
|
src=$import_path-x86_64
|
||||||
|
[[ -d $import_path-testing-x86_64 ]] && src=$import_path-testing-x86_64
|
||||||
|
[[ -d $import_path-any ]] && src=$import_path-any
|
||||||
|
[[ -d $import_path-testing-any ]] && src=$import_path-testing-any
|
||||||
|
;;
|
||||||
|
lib32)
|
||||||
|
arch_repo=multilib
|
||||||
|
arch_dir=community
|
||||||
|
import_path=${tree_dir_arch}/$arch_dir/$pkg/repos
|
||||||
|
src=$import_path/$arch_repo-x86_64
|
||||||
|
[[ -d $import_path/$arch_repo-testing-x86_64 ]] && src=$import_path/$arch_repo-testing-x86_64
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
echo $src
|
||||||
|
}
|
||||||
|
|
||||||
|
show_version_table(){
|
||||||
|
local repo="$1"
|
||||||
|
declare -A UPDATES
|
||||||
|
msg_table_header "%-30s %-30s %-30s %-30s" "Repository" "Package" "Artix version" "Arch version"
|
||||||
|
for pkg in ${tree_dir_artix}/$repo/*; do
|
||||||
|
if [[ -f $pkg/PKGBUILD ]];then
|
||||||
|
source $pkg/PKGBUILD 2>/dev/null
|
||||||
|
package=${pkg##*/}
|
||||||
|
artixver=$(get_full_version $package)
|
||||||
|
local src=$(get_import_path "$repo" "$package")
|
||||||
|
if [[ -f $src/PKGBUILD ]];then
|
||||||
|
source $src/PKGBUILD 2>/dev/null
|
||||||
|
archver=$(get_full_version $package)
|
||||||
|
fi
|
||||||
|
if [ $(vercmp $artixver $archver) -lt 0 ];then
|
||||||
|
UPDATES[$package]="$pkg/PKGBUILD $src/PKGBUILD"
|
||||||
|
msg_row_update "%-30s %-30s %-30s %-30s" "$repo" "$package" "$artixver" "$archver"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
unset pkgver epoch pkgrel artixver archver package
|
||||||
done
|
done
|
||||||
|
find "${patches_dir}/$repo/" -name *.patch -delete
|
||||||
|
for upd in "${!UPDATES[@]}"; do
|
||||||
|
msg "Writing %s update patch ..." "$upd"
|
||||||
|
diff -u ${UPDATES[$upd]} > ${patches_dir}/$repo/"$upd"-archlinux.patch
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
import_from_arch(){
|
||||||
|
local timer=$(get_timer) branch='testing' repo="$1" push="$2"
|
||||||
|
read_import_list "$repo"
|
||||||
|
if [[ -n ${import_list[@]} ]];then
|
||||||
|
cd ${tree_dir_artix}/$repo
|
||||||
|
git checkout $branch &> /dev/null
|
||||||
|
$(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
|
||||||
|
git pull origin "$branch"
|
||||||
|
for pkg in ${import_list[@]};do
|
||||||
|
local src=$(get_import_path "$repo" "$pkg") dest=${tree_dir_artix}/$repo/$pkg
|
||||||
|
source $src/PKGBUILD 2>/dev/null
|
||||||
|
local ver=$(get_full_version $pkg)
|
||||||
|
msg "Package: %s-%s" "$pkg" "$ver"
|
||||||
|
msg2 "src: %s" "$src"
|
||||||
|
msg2 "dest: %s" "$dest"
|
||||||
|
rsync "${rsync_args[@]}" $src/ $dest/
|
||||||
|
patch_pkg "$pkg"
|
||||||
|
# if ${push};then
|
||||||
|
# local timeout=10
|
||||||
|
# git add "$pkg"
|
||||||
|
# git commit -m "$pkg-$ver"
|
||||||
|
# sleep $timeout
|
||||||
|
# git push origin "$branch"
|
||||||
|
# fi
|
||||||
|
unset pkgver epoch pkgrel ver
|
||||||
|
done
|
||||||
|
fi
|
||||||
show_elapsed_time "${FUNCNAME}" "${timer}"
|
show_elapsed_time "${FUNCNAME}" "${timer}"
|
||||||
}
|
}
|
||||||
|
@@ -9,15 +9,6 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
in_array() {
|
|
||||||
local needle=$1; shift
|
|
||||||
local item
|
|
||||||
for item in "$@"; do
|
|
||||||
[[ $item = $needle ]] && return 0 # Found
|
|
||||||
done
|
|
||||||
return 1 # Not Found
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: sofile
|
# $1: sofile
|
||||||
# $2: soarch
|
# $2: soarch
|
||||||
process_sofile() {
|
process_sofile() {
|
||||||
@@ -45,39 +36,15 @@ pkgver_equal() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
get_full_version() {
|
|
||||||
# set defaults if they weren't specified in buildfile
|
|
||||||
pkgbase=${pkgbase:-${pkgname[0]}}
|
|
||||||
epoch=${epoch:-0}
|
|
||||||
if [[ -z $1 ]]; then
|
|
||||||
if [[ $epoch ]] && (( ! $epoch )); then
|
|
||||||
echo $pkgver-$pkgrel
|
|
||||||
else
|
|
||||||
echo $epoch:$pkgver-$pkgrel
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
for i in pkgver pkgrel epoch; do
|
|
||||||
local indirect="${i}_override"
|
|
||||||
eval $(declare -f package_$1 | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")
|
|
||||||
[[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
|
|
||||||
done
|
|
||||||
if (( ! $epoch_override )); then
|
|
||||||
echo $pkgver_override-$pkgrel_override
|
|
||||||
else
|
|
||||||
echo $epoch_override:$pkgver_override-$pkgrel_override
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
find_cached_package() {
|
find_cached_package() {
|
||||||
local searchdirs=("$PWD" "$PKGDEST") results=()
|
local searchdirs=("$PKGDEST" "$PWD") results=()
|
||||||
local targetname=$1 targetver=$2 targetarch=$3
|
local targetname=$1 targetver=$2 targetarch=$3
|
||||||
local dir pkg pkgbasename name ver rel arch r results
|
local dir pkg pkgbasename name ver rel arch r results
|
||||||
|
|
||||||
for dir in "${searchdirs[@]}"; do
|
for dir in "${searchdirs[@]}"; do
|
||||||
[[ -d $dir ]] || continue
|
[[ -d $dir ]] || continue
|
||||||
|
|
||||||
for pkg in "$dir"/*.pkg.tar.xz; do
|
for pkg in "$dir"/*.pkg.tar.?z; do
|
||||||
[[ -f $pkg ]] || continue
|
[[ -f $pkg ]] || continue
|
||||||
|
|
||||||
# avoid adding duplicates of the same inode
|
# avoid adding duplicates of the same inode
|
||||||
@@ -87,7 +54,7 @@ find_cached_package() {
|
|||||||
|
|
||||||
# split apart package filename into parts
|
# split apart package filename into parts
|
||||||
pkgbasename=${pkg##*/}
|
pkgbasename=${pkg##*/}
|
||||||
pkgbasename=${pkgbasename%.pkg.tar?(.?z)}
|
pkgbasename=${pkgbasename%.pkg.tar.?z}
|
||||||
|
|
||||||
arch=${pkgbasename##*-}
|
arch=${pkgbasename##*-}
|
||||||
pkgbasename=${pkgbasename%-"$arch"}
|
pkgbasename=${pkgbasename%-"$arch"}
|
||||||
@@ -107,16 +74,16 @@ find_cached_package() {
|
|||||||
|
|
||||||
case ${#results[*]} in
|
case ${#results[*]} in
|
||||||
0)
|
0)
|
||||||
return 1
|
return 1
|
||||||
;;
|
;;
|
||||||
1)
|
1)
|
||||||
printf '%s\n' "$results"
|
printf '%s\n' "${results[0]}"
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
error 'Multiple packages found:'
|
error 'Multiple packages found:'
|
||||||
printf '\t%s\n' "${results[@]}" >&2
|
printf '\t%s\n' "${results[@]}" >&2
|
||||||
return 1
|
return 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
@@ -1,61 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; version 2 of the License.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
|
|
||||||
import ${LIBDIR}/util-yaml.sh
|
|
||||||
|
|
||||||
write_netgroup_yaml(){
|
|
||||||
local name="$1" yaml="$2"
|
|
||||||
msg2 "Writing %s ..." "${yaml##*/}"
|
|
||||||
echo "---" > "$yaml"
|
|
||||||
echo "- name: '$name'" >> "$yaml"
|
|
||||||
echo " description: '$name'" >> "$yaml"
|
|
||||||
echo " selected: false" >> "$yaml"
|
|
||||||
echo " hidden: false" >> "$yaml"
|
|
||||||
echo " critical: false" >> "$yaml"
|
|
||||||
echo " packages:" >> "$yaml"
|
|
||||||
for p in ${packages[@]};do
|
|
||||||
echo " - $p" >> "$yaml"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
write_pacman_group_yaml(){
|
|
||||||
local group="$1"
|
|
||||||
packages=$(pacman -Sgq "$group")
|
|
||||||
prepare_dir "${cache_dir_netinstall}/pacman"
|
|
||||||
write_netgroup_yaml "$group" "${cache_dir_netinstall}/pacman/$group.yaml"
|
|
||||||
}
|
|
||||||
|
|
||||||
gen_fn(){
|
|
||||||
echo "${yaml_dir}/$1-${target_arch}-${initsys}.yaml"
|
|
||||||
}
|
|
||||||
|
|
||||||
prepare_build(){
|
|
||||||
local profile_dir=${run_dir}/${profile}
|
|
||||||
|
|
||||||
load_profile "${profile_dir}"
|
|
||||||
|
|
||||||
yaml_dir=${cache_dir_netinstall}/${profile}/${target_arch}
|
|
||||||
|
|
||||||
prepare_dir "${yaml_dir}"
|
|
||||||
}
|
|
||||||
|
|
||||||
build(){
|
|
||||||
prepare_build
|
|
||||||
load_pkgs "${root_list}" "${target_arch}" "${initsys}" "${kernel}"
|
|
||||||
write_netgroup_yaml "${profile}" "$(gen_fn "Packages-Root")"
|
|
||||||
if [[ -f "${desktop_list}" ]]; then
|
|
||||||
load_pkgs "${desktop_list}" "${target_arch}" "${initsys}" "${kernel}"
|
|
||||||
write_netgroup_yaml "${profile}" "$(gen_fn "Packages-Desktop")"
|
|
||||||
fi
|
|
||||||
${calamares} && configure_calamares "${yaml_dir}"
|
|
||||||
reset_profile
|
|
||||||
unset yaml_dir
|
|
||||||
}
|
|
222
lib/util-yaml.sh
222
lib/util-yaml.sh
@@ -1,222 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; version 2 of the License.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
|
|
||||||
write_machineid_conf(){
|
|
||||||
local conf="${modules_dir}/machineid.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo '---' > "$conf"
|
|
||||||
echo "systemd: false" >> $conf
|
|
||||||
echo "dbus: true" >> $conf
|
|
||||||
echo "symlink: true" >> $conf
|
|
||||||
}
|
|
||||||
|
|
||||||
write_finished_conf(){
|
|
||||||
msg2 "Writing %s ..." "finished.conf"
|
|
||||||
local conf="${modules_dir}/finished.conf" cmd="loginctl reboot"
|
|
||||||
echo '---' > "$conf"
|
|
||||||
echo 'restartNowEnabled: true' >> "$conf"
|
|
||||||
echo 'restartNowChecked: false' >> "$conf"
|
|
||||||
echo "restartNowCommand: \"${cmd}\"" >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
get_preset(){
|
|
||||||
local p=${tmp_dir}/${kernel}.preset
|
|
||||||
cp ${DATADIR}/linux.preset $p
|
|
||||||
sed -e "s|@kernel@|$kernel|g" \
|
|
||||||
-e "s|@arch@|${target_arch}|g"\
|
|
||||||
-i $p
|
|
||||||
echo $p
|
|
||||||
}
|
|
||||||
|
|
||||||
write_bootloader_conf(){
|
|
||||||
local conf="${modules_dir}/bootloader.conf" efi_boot_loader='grub'
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
source "$(get_preset)"
|
|
||||||
echo '---' > "$conf"
|
|
||||||
echo "efiBootLoader: \"${efi_boot_loader}\"" >> "$conf"
|
|
||||||
echo "kernel: \"${ALL_kver#*/boot}\"" >> "$conf"
|
|
||||||
echo "img: \"${default_image#*/boot}\"" >> "$conf"
|
|
||||||
echo "fallback: \"${fallback_image#*/boot}\"" >> "$conf"
|
|
||||||
echo 'timeout: "10"' >> "$conf"
|
|
||||||
echo "kernelLine: \", with ${kernel}\"" >> "$conf"
|
|
||||||
echo "fallbackKernelLine: \", with ${kernel} (fallback initramfs)\"" >> "$conf"
|
|
||||||
echo 'grubInstall: "grub-install"' >> "$conf"
|
|
||||||
echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
|
|
||||||
echo 'grubCfg: "/boot/grub/grub.cfg"' >> "$conf"
|
|
||||||
echo '#efiBootloaderId: "dirname"' >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
write_servicescfg_conf(){
|
|
||||||
local conf="${modules_dir}/servicescfg.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo '---' > "$conf"
|
|
||||||
echo '' >> "$conf"
|
|
||||||
echo 'services:' >> "$conf"
|
|
||||||
echo ' enabled:' >> "$conf"
|
|
||||||
for s in ${openrc_boot[@]};do
|
|
||||||
echo " - name: $s" >> "$conf"
|
|
||||||
echo ' runlevel: boot' >> "$conf"
|
|
||||||
done
|
|
||||||
for s in ${openrc_default[@]};do
|
|
||||||
echo " - name: $s" >> "$conf"
|
|
||||||
echo ' runlevel: default' >> "$conf"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
write_displaymanager_conf(){
|
|
||||||
local conf="${modules_dir}/displaymanager.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo "---" > "$conf"
|
|
||||||
echo "displaymanagers:" >> "$conf"
|
|
||||||
echo " - lightdm" >> "$conf"
|
|
||||||
echo " - gdm" >> "$conf"
|
|
||||||
echo " - mdm" >> "$conf"
|
|
||||||
echo " - sddm" >> "$conf"
|
|
||||||
echo " - lxdm" >> "$conf"
|
|
||||||
echo " - slim" >> "$conf"
|
|
||||||
echo '' >> "$conf"
|
|
||||||
echo "basicSetup: false" >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
write_initcpio_conf(){
|
|
||||||
local conf="${modules_dir}/initcpio.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo "---" > "$conf"
|
|
||||||
echo "kernel: ${kernel}" >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
write_users_conf(){
|
|
||||||
local conf="${modules_dir}/users.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo "---" > "$conf"
|
|
||||||
echo "defaultGroups:" >> "$conf"
|
|
||||||
local IFS=','
|
|
||||||
for g in ${addgroups[@]};do
|
|
||||||
echo " - $g" >> "$conf"
|
|
||||||
done
|
|
||||||
unset IFS
|
|
||||||
echo "autologinGroup: autologin" >> "$conf"
|
|
||||||
echo "doAutologin: false" >> "$conf" # can be either 'true' or 'false'
|
|
||||||
echo "sudoersGroup: wheel" >> "$conf"
|
|
||||||
echo "setRootPassword: true" >> "$conf" # must be true, else some options get hidden
|
|
||||||
echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
|
|
||||||
echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
|
|
||||||
echo "avatarFilePath: ~/.face" >> "$conf" # mostly used file-name for avatar
|
|
||||||
}
|
|
||||||
|
|
||||||
write_welcome_conf(){
|
|
||||||
local conf="${modules_dir}/welcome.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo "---" > "$conf" >> "$conf"
|
|
||||||
echo "showSupportUrl: true" >> "$conf"
|
|
||||||
echo "showKnownIssuesUrl: true" >> "$conf"
|
|
||||||
echo "showReleaseNotesUrl: true" >> "$conf"
|
|
||||||
echo '' >> "$conf"
|
|
||||||
echo "requirements:" >> "$conf"
|
|
||||||
echo " requiredStorage: 7.9" >> "$conf"
|
|
||||||
echo " requiredRam: 1.0" >> "$conf"
|
|
||||||
echo " internetCheckUrl: https://github.com/cromnix" >> "$conf"
|
|
||||||
echo " check:" >> "$conf"
|
|
||||||
echo " - storage" >> "$conf"
|
|
||||||
echo " - ram" >> "$conf"
|
|
||||||
echo " - power" >> "$conf"
|
|
||||||
echo " - internet" >> "$conf"
|
|
||||||
echo " - root" >> "$conf"
|
|
||||||
echo " required:" >> "$conf"
|
|
||||||
echo " - storage" >> "$conf"
|
|
||||||
echo " - ram" >> "$conf"
|
|
||||||
echo " - root" >> "$conf"
|
|
||||||
echo " - internet" >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
write_umount_conf(){
|
|
||||||
local conf="${modules_dir}/umount.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo "---" > "$conf"
|
|
||||||
echo 'srcLog: "/root/.cache/Calamares/Calamares/Calamares.log"' >> "$conf"
|
|
||||||
echo 'destLog: "/var/log/Calamares.log"' >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
get_yaml(){
|
|
||||||
echo "netgroups-${initsys}.yaml"
|
|
||||||
}
|
|
||||||
|
|
||||||
write_netinstall_conf(){
|
|
||||||
local conf="${modules_dir}/netinstall.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo "---" > "$conf"
|
|
||||||
echo "groupsUrl: ${netgroups}/$(get_yaml)" >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
write_locale_conf(){
|
|
||||||
local conf="${modules_dir}/locale.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo "---" > "$conf"
|
|
||||||
echo "localeGenPath: /etc/locale.gen" >> "$conf"
|
|
||||||
echo "geoipUrl: freegeoip.net" >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
write_settings_conf(){
|
|
||||||
local conf="$1/etc/calamares/settings.conf"
|
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
|
||||||
echo "---" > "$conf"
|
|
||||||
echo "modules-search: [ local ]" >> "$conf"
|
|
||||||
echo '' >> "$conf"
|
|
||||||
echo "sequence:" >> "$conf"
|
|
||||||
echo " - show:" >> "$conf"
|
|
||||||
echo " - welcome" >> "$conf" && write_welcome_conf
|
|
||||||
echo " - locale" >> "$conf" && write_locale_conf
|
|
||||||
echo " - keyboard" >> "$conf"
|
|
||||||
echo " - partition" >> "$conf"
|
|
||||||
echo " - users" >> "$conf" && write_users_conf
|
|
||||||
echo " - netinstall" >> "$conf" && write_netinstall_conf
|
|
||||||
echo " - summary" >> "$conf"
|
|
||||||
echo " - exec:" >> "$conf"
|
|
||||||
echo " - partition" >> "$conf"
|
|
||||||
echo " - mount" >> "$conf"
|
|
||||||
echo " - chrootcfg" >> "$conf"
|
|
||||||
echo " - networkcfg" >> "$conf"
|
|
||||||
echo " - machineid" >> "$conf" && write_machineid_conf
|
|
||||||
echo " - fstab" >> "$conf"
|
|
||||||
echo " - locale" >> "$conf"
|
|
||||||
echo " - keyboard" >> "$conf"
|
|
||||||
echo " - localecfg" >> "$conf"
|
|
||||||
echo " - luksopenswaphookcfg" >> "$conf"
|
|
||||||
echo " - luksbootkeyfile" >> "$conf"
|
|
||||||
echo " - initcpiocfg" >> "$conf"
|
|
||||||
echo " - initcpio" >> "$conf" && write_initcpio_conf
|
|
||||||
echo " - users" >> "$conf"
|
|
||||||
echo " - displaymanager" >> "$conf" && write_displaymanager_conf
|
|
||||||
echo " - hwclock" >> "$conf"
|
|
||||||
case ${initsys} in
|
|
||||||
'openrc') echo " - servicescfg" >> "$conf" && write_servicescfg_conf ;;
|
|
||||||
esac
|
|
||||||
echo " - grubcfg" >> "$conf"
|
|
||||||
echo " - bootloader" >> "$conf" && write_bootloader_conf
|
|
||||||
echo " - postcfg" >> "$conf"
|
|
||||||
echo " - umount" >> "$conf" && write_umount_conf
|
|
||||||
echo " - show:" >> "$conf"
|
|
||||||
echo " - finished" >> "$conf" && write_finished_conf
|
|
||||||
echo '' >> "$conf"
|
|
||||||
echo "branding: ${os_id}" >> "$conf"
|
|
||||||
echo '' >> "$conf"
|
|
||||||
echo "prompt-install: false" >> "$conf"
|
|
||||||
echo '' >> "$conf"
|
|
||||||
echo "dont-chroot: false" >> "$conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_calamares(){
|
|
||||||
info "Configuring [Calamares]"
|
|
||||||
modules_dir=$1/etc/calamares/modules
|
|
||||||
prepare_dir "${modules_dir}"
|
|
||||||
write_settings_conf "$1"
|
|
||||||
info "Done configuring [Calamares]"
|
|
||||||
}
|
|
64
lib/util.sh
64
lib/util.sh
@@ -37,11 +37,6 @@ prepare_dir(){
|
|||||||
[[ ! -d $1 ]] && mkdir -p $1
|
[[ ! -d $1 ]] && mkdir -p $1
|
||||||
}
|
}
|
||||||
|
|
||||||
get_distname(){
|
|
||||||
source /usr/lib/os-release
|
|
||||||
echo "${NAME%Linux}"
|
|
||||||
}
|
|
||||||
|
|
||||||
get_disturl(){
|
get_disturl(){
|
||||||
source /usr/lib/os-release
|
source /usr/lib/os-release
|
||||||
echo "${HOME_URL}"
|
echo "${HOME_URL}"
|
||||||
@@ -59,24 +54,10 @@ get_osid(){
|
|||||||
|
|
||||||
init_artools_base(){
|
init_artools_base(){
|
||||||
|
|
||||||
[[ -z ${target_arch} ]] && target_arch=$(uname -m)
|
target_arch=$(uname -m)
|
||||||
|
|
||||||
[[ -z ${chroots_dir} ]] && chroots_dir='/var/lib/artools'
|
[[ -z ${chroots_dir} ]] && chroots_dir='/var/lib/artools'
|
||||||
|
|
||||||
[[ -z ${build_mirror} ]] && build_mirror='https://downloads.sourceforge.net/project/artix-linux/repos'
|
|
||||||
|
|
||||||
log_dir='/var/log/artools'
|
|
||||||
|
|
||||||
tmp_dir='/tmp'
|
|
||||||
|
|
||||||
host="sourceforge.net"
|
|
||||||
|
|
||||||
[[ -z ${host_mirrors[@]} ]] && host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
|
|
||||||
|
|
||||||
[[ -z ${project} ]] && project="artix-linux"
|
|
||||||
|
|
||||||
[[ -z ${account} ]] && account="[SetUser]"
|
|
||||||
|
|
||||||
[[ -z ${workspace_dir} ]] && workspace_dir=/home/${OWNER}/artools-workspace
|
[[ -z ${workspace_dir} ]] && workspace_dir=/home/${OWNER}/artools-workspace
|
||||||
|
|
||||||
prepare_dir "${workspace_dir}"
|
prepare_dir "${workspace_dir}"
|
||||||
@@ -86,7 +67,7 @@ init_artools_pkg(){
|
|||||||
|
|
||||||
[[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
|
[[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
|
||||||
|
|
||||||
[[ -z ${repo_tree_import[@]} ]] && repo_tree_import=('system' 'world' 'galaxy')
|
[[ -z ${repo_tree_artix[@]} ]] && repo_tree_artix=('system' 'world' 'galaxy' 'lib32')
|
||||||
|
|
||||||
[[ -z ${host_tree_artix} ]] && host_tree_artix='https://github.com/artix-linux'
|
[[ -z ${host_tree_artix} ]] && host_tree_artix='https://github.com/artix-linux'
|
||||||
|
|
||||||
@@ -102,40 +83,32 @@ init_artools_pkg(){
|
|||||||
|
|
||||||
chroots_pkg="${chroots_dir}/buildpkg"
|
chroots_pkg="${chroots_dir}/buildpkg"
|
||||||
|
|
||||||
make_conf_dir="${SYSCONFDIR}/make.conf.d"
|
[[ -z ${patches_dir} ]] && patches_dir=${workspace_dir}/archlinux-patches
|
||||||
|
|
||||||
cache_dir_pkg=${workspace_dir}/pkg
|
[[ -z ${repos_root} ]] && repos_root="${workspace_dir}/repos"
|
||||||
|
|
||||||
prepare_dir "${cache_dir_pkg}"
|
|
||||||
|
|
||||||
repository='system'
|
|
||||||
|
|
||||||
[[ -z ${repos_local} ]] && repos_local="${workspace_dir}/repos"
|
|
||||||
|
|
||||||
repos_remote="/${repos_local##*/}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
init_artools_iso(){
|
init_artools_iso(){
|
||||||
chroots_iso="${chroots_dir}/buildiso"
|
chroots_iso="${chroots_dir}/buildiso"
|
||||||
|
|
||||||
cache_dir_iso="${workspace_dir}/iso"
|
[[ -z ${iso_pool} ]] && iso_pool="${workspace_dir}/iso"
|
||||||
|
|
||||||
prepare_dir "${cache_dir_iso}"
|
prepare_dir "${iso_pool}"
|
||||||
|
|
||||||
[[ -z ${profile} ]] && profile='base'
|
profile='base'
|
||||||
|
|
||||||
[[ -z ${dist_release} ]] && dist_release=$(date +%Y%m%d)
|
[[ -z ${iso_version} ]] && iso_version=$(date +%Y%m%d)
|
||||||
|
|
||||||
dist_name=$(get_distname)
|
iso_name=$(get_osid)
|
||||||
|
|
||||||
os_id=$(get_osid)
|
iso_label="ARTIX_$(date +%Y%m)"
|
||||||
|
|
||||||
[[ -z ${dist_branding} ]] && dist_branding="ARTIX"
|
|
||||||
|
|
||||||
[[ -z ${initsys} ]] && initsys="openrc"
|
[[ -z ${initsys} ]] && initsys="openrc"
|
||||||
|
|
||||||
[[ -z ${kernel} ]] && kernel="linux-lts"
|
[[ -z ${kernel} ]] && kernel="linux-lts"
|
||||||
|
|
||||||
|
[[ -z ${kernel_args} ]] && kernel_args=""
|
||||||
|
|
||||||
[[ -z ${gpgkey} ]] && gpgkey=''
|
[[ -z ${gpgkey} ]] && gpgkey=''
|
||||||
|
|
||||||
[[ -z ${uplimit} ]] && uplimit=100
|
[[ -z ${uplimit} ]] && uplimit=100
|
||||||
@@ -144,6 +117,14 @@ init_artools_iso(){
|
|||||||
|
|
||||||
[[ -z ${piece_size} ]] && piece_size=21
|
[[ -z ${piece_size} ]] && piece_size=21
|
||||||
|
|
||||||
|
[[ -z ${file_host} ]] && file_host="sourceforge.net"
|
||||||
|
|
||||||
|
[[ -z ${project} ]] && project="artix-linux"
|
||||||
|
|
||||||
|
[[ -z ${account} ]] && account="[SetUser]"
|
||||||
|
|
||||||
|
[[ -z ${host_mirrors[@]} ]] && host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
|
||||||
|
|
||||||
torrent_meta="$(get_osname)"
|
torrent_meta="$(get_osname)"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,8 +197,3 @@ check_root() {
|
|||||||
exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
|
exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
connect(){
|
|
||||||
local home="/home/frs/project/${project}"
|
|
||||||
echo "${account},${project}@frs.${host}:${home}"
|
|
||||||
}
|
|
||||||
|
Reference in New Issue
Block a user