mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-15 19:06:19 +02:00
Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
fc95a57556 | ||
![]() |
21458bd07b | ||
![]() |
a05969b29d | ||
![]() |
fdeaed894a | ||
![]() |
3699321904 | ||
![]() |
d8ec9c9066 | ||
![]() |
fbb2bd2b8e | ||
![]() |
d5c6bc7656 | ||
![]() |
f7615fe7d7 | ||
![]() |
1703b92e1a |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,5 +1,5 @@
|
|||||||
*~
|
*~
|
||||||
devtools-*.tar.gz
|
devtools-*.tar.gz*
|
||||||
archbuild
|
archbuild
|
||||||
archco
|
archco
|
||||||
archrelease
|
archrelease
|
||||||
|
@@ -13,7 +13,7 @@ case $scriptname in
|
|||||||
archco)
|
archco)
|
||||||
SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
|
SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
|
||||||
communityco)
|
communityco)
|
||||||
SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";;
|
SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
|
||||||
*)
|
*)
|
||||||
die "Couldn't find svn url for $scriptname"
|
die "Couldn't find svn url for $scriptname"
|
||||||
;;
|
;;
|
||||||
|
@@ -66,7 +66,7 @@ for tag in "$@"; do
|
|||||||
while read -r file; do
|
while read -r file; do
|
||||||
trash+=("repos/$tag/$file")
|
trash+=("repos/$tag/$file")
|
||||||
done < <(svn ls "repos/$tag")
|
done < <(svn ls "repos/$tag")
|
||||||
[[ $trash ]] && svn rm -q "${trash[@]}"
|
[[ $trash ]] && svn rm -q "${trash[@]/%/@}"
|
||||||
else
|
else
|
||||||
mkdir -p "repos/$tag"
|
mkdir -p "repos/$tag"
|
||||||
svn add --parents -q "repos/$tag"
|
svn add --parents -q "repos/$tag"
|
||||||
|
@@ -109,7 +109,7 @@ if [[ -z $server ]]; then
|
|||||||
core|extra|testing|staging|kde-unstable|gnome-unstable)
|
core|extra|testing|staging|kde-unstable|gnome-unstable)
|
||||||
server='gerolde.archlinux.org' ;;
|
server='gerolde.archlinux.org' ;;
|
||||||
community*|multilib*)
|
community*|multilib*)
|
||||||
server='aur.archlinux.org' ;;
|
server='nymeria.archlinux.org' ;;
|
||||||
*)
|
*)
|
||||||
server='gerolde.archlinux.org'
|
server='gerolde.archlinux.org'
|
||||||
msg "Non-standard repository $repo in use, defaulting to server $server" ;;
|
msg "Non-standard repository $repo in use, defaulting to server $server" ;;
|
||||||
|
@@ -13,8 +13,8 @@ pkgbase="${1}"
|
|||||||
|
|
||||||
packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
|
packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
|
||||||
packages_server='gerolde.archlinux.org'
|
packages_server='gerolde.archlinux.org'
|
||||||
community_svn='svn+ssh://aur.archlinux.org/srv/svn-packages'
|
community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn'
|
||||||
community_server='aur.archlinux.org'
|
community_server='nymeria.archlinux.org'
|
||||||
mirror='http://mirrors.kernel.org/archlinux'
|
mirror='http://mirrors.kernel.org/archlinux'
|
||||||
|
|
||||||
case $scriptname in
|
case $scriptname in
|
||||||
|
@@ -78,7 +78,7 @@ trap_abort() {
|
|||||||
|
|
||||||
trap_exit() {
|
trap_exit() {
|
||||||
trap - EXIT INT QUIT TERM HUP
|
trap - EXIT INT QUIT TERM HUP
|
||||||
cleanup 0
|
cleanup
|
||||||
}
|
}
|
||||||
|
|
||||||
die() {
|
die() {
|
||||||
|
@@ -131,7 +131,7 @@ chroot_mount() {
|
|||||||
[[ -e "${working_dir}/run" ]] || mkdir "${working_dir}/run"
|
[[ -e "${working_dir}/run" ]] || mkdir "${working_dir}/run"
|
||||||
mount -t tmpfs tmpfs "${working_dir}/run" -o mode=0755,nodev,nosuid,strictatime,size=64M
|
mount -t tmpfs tmpfs "${working_dir}/run" -o mode=0755,nodev,nosuid,strictatime,size=64M
|
||||||
|
|
||||||
for host_config in resolv.conf timezone localtime; do
|
for host_config in resolv.conf localtime; do
|
||||||
bind_mount /etc/$host_config ro
|
bind_mount /etc/$host_config ro
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
@@ -160,7 +160,8 @@ copy_hostconf () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
trap_chroot_umount () {
|
trap_chroot_umount () {
|
||||||
trap 'trap_exit' EXIT INT QUIT TERM HUP
|
trap 'trap_abort' INT QUIT TERM HUP
|
||||||
|
trap 'trap_exit' EXIT
|
||||||
|
|
||||||
for cache_dir in ${cache_dirs[@]}; do
|
for cache_dir in ${cache_dirs[@]}; do
|
||||||
umount "${working_dir}/${cache_dir}"
|
umount "${working_dir}/${cache_dir}"
|
||||||
@@ -168,7 +169,7 @@ trap_chroot_umount () {
|
|||||||
[[ -n $host_mirror_path ]] && umount "${working_dir}/${host_mirror_path}"
|
[[ -n $host_mirror_path ]] && umount "${working_dir}/${host_mirror_path}"
|
||||||
|
|
||||||
if (( ! have_nspawn )); then
|
if (( ! have_nspawn )); then
|
||||||
for host_config in resolv.conf timezone localtime; do
|
for host_config in resolv.conf localtime; do
|
||||||
umount "${working_dir}/etc/${host_config}"
|
umount "${working_dir}/etc/${host_config}"
|
||||||
done
|
done
|
||||||
umount "${working_dir}/proc/sys"
|
umount "${working_dir}/proc/sys"
|
||||||
|
Reference in New Issue
Block a user