forked from mirrored-repos/manjaro-tools
fixes; use renamed scripts
This commit is contained in:
parent
c58b12ff7d
commit
b54266cc9e
7 changed files with 13 additions and 13 deletions
|
@ -42,12 +42,12 @@ chroot_clean(){
|
||||||
chroot_create(){
|
chroot_create(){
|
||||||
mkdir -p "${chrootdir}"
|
mkdir -p "${chrootdir}"
|
||||||
setarch ${arch} \
|
setarch ${arch} \
|
||||||
mkmanjaroroot ${mkmanjaroroot_args[*]} ${chrootdir}/root ${base_packages[*]} || abort
|
mkchroot ${mkmanjaroroot_args[*]} ${chrootdir}/root ${base_packages[*]} || abort
|
||||||
}
|
}
|
||||||
|
|
||||||
chroot_update(){
|
chroot_update(){
|
||||||
setarch "${arch}" \
|
setarch "${arch}" \
|
||||||
mkmanjaroroot ${mkmanjaroroot_args[*]} -u ${chrootdir}/$(get_user) || abort
|
mkchroot ${mkmanjaroroot_args[*]} -u ${chrootdir}/$(get_user) || abort
|
||||||
}
|
}
|
||||||
|
|
||||||
chroot_init(){
|
chroot_init(){
|
||||||
|
@ -70,7 +70,7 @@ chroot_build_set(){
|
||||||
for pkg in $(cat ${profiledir}/${profile}.set); do
|
for pkg in $(cat ${profiledir}/${profile}.set); do
|
||||||
cd $pkg
|
cd $pkg
|
||||||
setarch ${arch} \
|
setarch ${arch} \
|
||||||
makechrootpkg ${makechrootpkg_args[*]} -- "${makepkg_args[*]}" || break
|
mkchrootpkg ${makechrootpkg_args[*]} -- "${makepkg_args[*]}" || break
|
||||||
if [[ $pkg == 'eudev' ]]; then
|
if [[ $pkg == 'eudev' ]]; then
|
||||||
local blacklist=('libsystemd')
|
local blacklist=('libsystemd')
|
||||||
pacman -Rdd "${blacklist[@]}" -r ${chrootdir}/$(get_user) --noconfirm
|
pacman -Rdd "${blacklist[@]}" -r ${chrootdir}/$(get_user) --noconfirm
|
||||||
|
@ -91,7 +91,7 @@ chroot_build(){
|
||||||
cd ${profile}
|
cd ${profile}
|
||||||
chroot_init
|
chroot_init
|
||||||
setarch ${arch} \
|
setarch ${arch} \
|
||||||
makechrootpkg ${makechrootpkg_args[*]} -- "${makepkg_args[*]}" || abort
|
mkchrootpkg ${makechrootpkg_args[*]} -- "${makepkg_args[*]}" || abort
|
||||||
cd ..
|
cd ..
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#m4_include(lib/common.sh)
|
#m4_include(lib/common.sh)
|
||||||
|
|
||||||
source @libdir@/shared_lib.sh
|
source @libdir@/functions.sh
|
||||||
|
|
||||||
# Source makepkg.conf; fail if it is not found
|
# Source makepkg.conf; fail if it is not found
|
||||||
if [[ -r '/etc/makepkg.conf' ]]; then
|
if [[ -r '/etc/makepkg.conf' ]]; then
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#m4_include(lib/common.sh)
|
#m4_include(lib/common.sh)
|
||||||
|
|
||||||
source @libdir@/shared_lib.sh
|
source @libdir@/functions.sh
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
shopt -s extglob
|
shopt -s extglob
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
# m4_include(lib/common.sh)
|
# m4_include(lib/common.sh)
|
||||||
|
|
||||||
source @libdir@/shared_lib.sh
|
source @libdir@/functions.sh
|
||||||
|
|
||||||
match=$1
|
match=$1
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
# m4_include(lib/common.sh)
|
# m4_include(lib/common.sh)
|
||||||
|
|
||||||
source @libdir@/shared_lib.sh
|
source @libdir@/functions.sh
|
||||||
|
|
||||||
ifs=$IFS
|
ifs=$IFS
|
||||||
IFS="${IFS}:"
|
IFS="${IFS}:"
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
# m4_include(lib/common.sh)
|
# m4_include(lib/common.sh)
|
||||||
|
|
||||||
source @libdir@/shared_lib.sh
|
source @libdir@/functions.sh
|
||||||
|
|
||||||
CHROOT_VERSION='v3'
|
CHROOT_VERSION='v3'
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
# m4_include(lib/common.sh)
|
# m4_include(lib/common.sh)
|
||||||
|
|
||||||
source @libdir@/shared_lib.sh
|
source @libdir@/functions.sh
|
||||||
|
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
|
|
||||||
|
@ -167,7 +167,7 @@ if [[ -n "${install_pkgs[*]}" ]]; then
|
||||||
pkgname="${install_pkg##*/}"
|
pkgname="${install_pkg##*/}"
|
||||||
cp "$install_pkg" "$copydir/$pkgname"
|
cp "$install_pkg" "$copydir/$pkgname"
|
||||||
|
|
||||||
mkmanjaroroot -b "${branch}" -r "pacman -U /$pkgname --noconfirm" "$copydir"
|
mkchroot -b "${branch}" -r "pacman -U /$pkgname --noconfirm" "$copydir"
|
||||||
(( ret += !! $? ))
|
(( ret += !! $? ))
|
||||||
|
|
||||||
rm "$copydir/$pkgname"
|
rm "$copydir/$pkgname"
|
||||||
|
@ -177,7 +177,7 @@ if [[ -n "${install_pkgs[*]}" ]]; then
|
||||||
[[ -f PKGBUILD ]] || exit $ret
|
[[ -f PKGBUILD ]] || exit $ret
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$update_first && mkmanjaroroot -b "${branch}" -u "$copydir"
|
$update_first && mkchroot -b "${branch}" -u "$copydir"
|
||||||
|
|
||||||
mkdir -p "$copydir/build"
|
mkdir -p "$copydir/build"
|
||||||
|
|
||||||
|
@ -293,7 +293,7 @@ exit 0
|
||||||
EOF
|
EOF
|
||||||
chmod +x "$copydir/chrootbuild"
|
chmod +x "$copydir/chrootbuild"
|
||||||
|
|
||||||
if mkmanjaroroot -b "${branch}" -r "/chrootbuild" "$copydir"; then
|
if mkchroot -b "${branch}" -r "/chrootbuild" "$copydir"; then
|
||||||
for pkgfile in "$copydir"/pkgdest/*.pkg.tar.?z; do
|
for pkgfile in "$copydir"/pkgdest/*.pkg.tar.?z; do
|
||||||
if $add_to_db; then
|
if $add_to_db; then
|
||||||
mkdir -p "$copydir/repo"
|
mkdir -p "$copydir/repo"
|
||||||
|
|
Loading…
Reference in a new issue