diff options
| -rwxr-xr-x | aur | 6 | ||||
| -rwxr-xr-x | libremakepkg | 22 | ||||
| -rwxr-xr-x | librerepkg | 23 |
3 files changed, 29 insertions, 22 deletions
@@ -39,9 +39,13 @@ missing_deps=() for _pkg in ${@}; do # Remove the version -# TODO check downloaded PKGBUILD version _pkg="${_pkg%%[<>=]*}" + if [ -f "${_pkg}/PKGBUILD" ]; then + warning "${_pkg} already existed. skipping..." + continue + fi + msg "Downloading $_pkg..." wget -O - -q http://aur.archlinux.org/packages/$_pkg/$_pkg.tar.gz | \ tar xzf - >/dev/null 2>&1 diff --git a/libremakepkg b/libremakepkg index cb71300..2f90cce 100755 --- a/libremakepkg +++ b/libremakepkg @@ -49,15 +49,18 @@ function usage { # Display message and exit function buildenv { # Mounts *DEST from makepkg.conf msg "Building env" - for mp in SRCDEST PKGDEST SRCPKGDEST; do +# for mp in SRCDEST PKGDEST SRCPKGDEST; do # The host system directory - lmp=LOCAL${mp} +# lmp=LOCAL${mp} - msg2 "Binding ${!lmp} to ${CHROOTDIR}/${CHROOT}${!mp}" +# msg2 "Binding ${!lmp} to ${CHROOTDIR}/${CHROOT}${!mp}" - mkdir -p "${CHROOTDIR}/${CHROOT}${!mp}" - mount -o bind ${!lmp} "${CHROOTDIR}/${CHROOT}${!mp}" || exit 1 - done +# mkdir -p "${CHROOTDIR}/${CHROOT}${!mp}" +# mount -o bind ${!lmp} "${CHROOTDIR}/${CHROOT}${!mp}" || exit 1 +# done + + msg2 "Bind ${CACHEDIR} => ${CHROOTDIR}/${CHROOT}/var/cache/pacman/pkg/" + mount -o bind ${CACHEDIR} ${CHROOTDIR}/${CHROOT}/var/cache/pacman/pkg/ } @@ -71,19 +74,14 @@ function clean_chroot { # Clean packages with pacman #!/bin/bash export LANG=C -clean='false' - -while [ "\$clean" = 'false' ]; do - pkgs=(\$(comm -23 <(pacman -Qq | sort) <(sort /root/cleansystem))) if [ \${#pkgs[@]} -gt 0 ]; then pacman --noconfirm -Rcs \${pkgs[@]} + pacman --noconfirm -S --needed base-devel gettext else - clean="true" echo "clean" fi -done EOF ) > "${CHROOTDIR}/${CHROOTNAME}/clean" chmod +x "${CHROOTDIR}/${CHROOTNAME}/clean" @@ -44,21 +44,26 @@ usage() { while getopts 'h' arg; do case $arg in h) usage; exit 0 ;; - *) makepkgflags=$@ ;; esac done +makepkgflags=$@ + tempdir=$(mktemp -d /tmp/$(basename $PWD).XXXXX) -msg "Repackaging: $pkgname $pkgver-$pkgrel ($(date -u))" -cp ./* ${tempdir}/ +for _arch in ${arch[@]}; do + export CARCH=${_arch} + + msg "Repackaging: $pkgname $pkgver-$pkgrel ($(date -u))" + cp ./* ${tempdir}/ -stdnull pushd ${tempdir} + stdnull pushd ${tempdir} -msg2 "Updating md5sums" -makepkg -gp rePKGBUILD >> rePKGBUILD + msg2 "Updating md5sums" + makepkg -gp rePKGBUILD >> rePKGBUILD -msg "Repackaging using makepkg" -makepkg -Lcdp rePKGBUILD ${makepkgflags} + msg "Repackaging using makepkg" + makepkg -Lcdp rePKGBUILD ${makepkgflags} -stdnull popd ${tempdir} + stdnull popd ${tempdir} +done |