diff --git a/PKGBUILD b/PKGBUILD index f03349ac2f11539efd73d958467727fea02ce8b0..df545d9f0d8af6452d12b456be49fe86f64d8aff 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -21,10 +21,9 @@ package() { install -m644 pacman-multilib-seblu.conf "$pkgdir/usr/share/devtools" # install binaries install -m755 seblu-build seblu-build-commit seblu-mirrors seblu-commit \ - seblu-remove seblu-cleanup seblu-list seblu-push update-arch-chroots \ + seblu-remove seblu-cleanup seblu-push update-arch-chroots \ "$pkgdir/usr/bin" # symlink archbuild - ln -s archbuild "$pkgdir/usr/bin/seblu-i686-build" ln -s archbuild "$pkgdir/usr/bin/seblu-x86_64-build" ln -s archbuild "$pkgdir/usr/bin/multilib-seblu-build" # symlink to seblu-build diff --git a/seblu-build b/seblu-build index dfcf9f206bf96d90b5b11b659b7707588b9bcdb2..c59e1ebe0bfb0454d02c5a121b93d755041fd6c1 100755 --- a/seblu-build +++ b/seblu-build @@ -16,10 +16,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -#chroot='/var/tmp/chroots' -#chroot_32="$chroot/seblu-i686" -#chroot_64="$chroot/seblu-x86_64" - [[ ! -f PKGBUILD ]] && echo 'No PKGBUILD' && exit 1 source /etc/makepkg.conf @@ -40,14 +36,9 @@ in_array() { return 1 # Not Found } -# arch amd64 build +# arch amd64 build and any builds if in_array 'x86_64' "${arch[@]}" || in_array 'any' "${arch[@]}"; then $repo-x86_64-build "$@" || exit 1 fi -# arch x86 and any builds -if in_array 'i686' "${arch[@]}"; then - $repo-i686-build "$@" || exit 1 -fi - # vim:set ts=2 sw=2 ft=sh noet ai: diff --git a/seblu-cleanup b/seblu-cleanup index 04646a1120c2b25f892e080022753d59c8b410e2..70fa861b65319ce583ffb91f64f75edd34d64b7c 100755 --- a/seblu-cleanup +++ b/seblu-cleanup @@ -18,7 +18,7 @@ db='seblu.db.tar.gz' repo='/srv/ftp/archlinux/seblu' -arch=('i686' 'x86_64') +arch=('x86_64') # source makepkg config . /etc/makepkg.conf diff --git a/seblu-commit b/seblu-commit index 8e804d21f1e29643201e488c4ee53d61f89c959c..6ff1aec818ef5a2d370607109d3782cc7719432b 100755 --- a/seblu-commit +++ b/seblu-commit @@ -18,7 +18,6 @@ dbname='seblu' repo="/srv/ftp/archlinux/$dbname" -repo_32="$repo/i686" repo_64="$repo/x86_64" # packages to add @@ -113,9 +112,8 @@ shift $((OPTIND - 1)); for _pkg; do case "$_pkg" in - *-i686$PKGEXT) to_32+=("$_pkg");; *-x86_64$PKGEXT) to_64+=("$_pkg");; - *-any$PKGEXT) to_32+=("$_pkg"); to_64+=("$_pkg");; + *-any$PKGEXT) to_64+=("$_pkg");; esac done @@ -126,9 +124,6 @@ fi sign_pkg "${to_32[@]}" "${to_64[@]}" -# add i686 packages -add_pkg "$repo_32" "${to_32[@]}" - # add x86_64 packages add_pkg "$repo_64" "${to_64[@]}" diff --git a/seblu-list b/seblu-list deleted file mode 100755 index d094ee313cd98b61ea2b3829359516f98786928d..0000000000000000000000000000000000000000 --- a/seblu-list +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -# Copyright © Sébastien Luttringer -# -# 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; either version 2 -# of the License, or (at your option) any later version. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -shopt -s xpg_echo - -db='seblu.db.tar.gz' -repo='/srv/ftp/archlinux/seblu' - -# source makepkg config -. /etc/makepkg.conf - -cleanup() { - [[ -e $arch32_file ]] && rm -f "$arch32_file" - [[ -e $arch64_file ]] && rm -f "$arch64_file" -} - -# remove temp file on exit -trap cleanup 0 - -# create temporary files for computes diff -arch32_file=$(mktemp -t ${0##*/}.XXXXX) -arch64_file=$(mktemp -t ${0##*/}.XXXXX) - -# get pkg list from db -bsdtar -xOf "$repo/i686/$db" | awk '/^%NAME%/{getline;print}'|sort > "$arch32_file" -bsdtar -xOf "$repo/x86_64/$db" | awk '/^%NAME%/{getline;print}'|sort > "$arch64_file" - -# list pkg in both arch -echo "\e[1;32m:: Package in both arch\e[0m" -comm -12 "$arch32_file" "$arch64_file" - -# list pkg in arch i686 -echo "\e[1;32m:: Package only in i686 arch\e[0m" -comm -23 "$arch32_file" "$arch64_file" - -# list pkg in arch x86_64 -echo "\e[1;32m:: Package only in x86_64 arch\e[0m" -comm -13 "$arch32_file" "$arch64_file" - -exit 0 - -# vim:set ts=2 sw=2 ft=sh noet: diff --git a/seblu-push b/seblu-push index bbf73ff7996ff12e7210b1ceeee7f3d1d4b8d201..b657498efe09b0828159398725829d90f158614d 100755 --- a/seblu-push +++ b/seblu-push @@ -89,7 +89,6 @@ push_pkg() { if (( $# > 0 )); then for _pkg; do case "$_pkg" in - *-i686$PKGEXT) to_commit+=("$_pkg");; *-x86_64$PKGEXT) to_commit+=("$_pkg");; *-any$PKGEXT) to_commit+=("$_pkg");; esac diff --git a/seblu-remove b/seblu-remove index 799084246b8a34d19bb21a7e3003e247872b4bd1..3d54063371683b094a66ed9d507fdac49e686e6f 100755 --- a/seblu-remove +++ b/seblu-remove @@ -20,6 +20,5 @@ REPO='/srv/ftp/archlinux/seblu' shopt -s nullglob for _p; do - repo-remove -q -s "$REPO"/i686/seblu.db.tar.gz "$_p" repo-remove -q -s "$REPO"/x86_64/seblu.db.tar.gz "$_p" done diff --git a/update-arch-chroots b/update-arch-chroots index b4fabf5a8695adbd953295d07ab3b8e13079c0a8..04d0b233a940dca0d9ddcbec1cc067bfdc6da700 100755 --- a/update-arch-chroots +++ b/update-arch-chroots @@ -22,7 +22,7 @@ cd /var/empty -for rep in {extra,testing,staging,seblu}-{i686,x86_64} multilib{,-seblu,-testing,-staging}; do +for rep in {extra,testing,staging,seblu}-x86_64 multilib{,-seblu,-testing,-staging}; do type -p $rep-build >/dev/null && $rep-build -c &>/dev/null done