Remove i686 support
This commit is contained in:
parent
94160d62b8
commit
7259e7def0
6
Makefile
6
Makefile
|
@ -19,7 +19,6 @@ BINPROGS = \
|
||||||
makechrootpkg
|
makechrootpkg
|
||||||
|
|
||||||
CONFIGFILES = \
|
CONFIGFILES = \
|
||||||
makepkg-i686.conf \
|
|
||||||
makepkg-x86_64.conf \
|
makepkg-x86_64.conf \
|
||||||
pacman-extra.conf \
|
pacman-extra.conf \
|
||||||
pacman-testing.conf \
|
pacman-testing.conf \
|
||||||
|
@ -45,18 +44,13 @@ COMMITPKG_LINKS = \
|
||||||
gnome-unstablepkg
|
gnome-unstablepkg
|
||||||
|
|
||||||
ARCHBUILD_LINKS = \
|
ARCHBUILD_LINKS = \
|
||||||
extra-i686-build \
|
|
||||||
extra-x86_64-build \
|
extra-x86_64-build \
|
||||||
testing-i686-build \
|
|
||||||
testing-x86_64-build \
|
testing-x86_64-build \
|
||||||
staging-i686-build \
|
|
||||||
staging-x86_64-build \
|
staging-x86_64-build \
|
||||||
multilib-build \
|
multilib-build \
|
||||||
multilib-testing-build \
|
multilib-testing-build \
|
||||||
multilib-staging-build \
|
multilib-staging-build \
|
||||||
kde-unstable-i686-build \
|
|
||||||
kde-unstable-x86_64-build \
|
kde-unstable-x86_64-build \
|
||||||
gnome-unstable-i686-build \
|
|
||||||
gnome-unstable-x86_64-build
|
gnome-unstable-x86_64-build
|
||||||
|
|
||||||
CROSSREPOMOVE_LINKS = \
|
CROSSREPOMOVE_LINKS = \
|
||||||
|
|
|
@ -189,12 +189,11 @@ if [[ ${#uploads[*]} -gt 0 ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${arch[*]}" == 'any' ]]; then
|
if [[ "${arch[*]}" == 'any' ]]; then
|
||||||
if [[ -d ../repos/$repo-i686 && -d ../repos/$repo-x86_64 ]]; then
|
if [[ -d ../repos/$repo-x86_64 ]]; then
|
||||||
pushd ../repos/ >/dev/null
|
pushd ../repos/ >/dev/null
|
||||||
stat_busy "Removing %s and %s" "$repo-i686" "$repo-x86_64"
|
stat_busy "Removing %s" "$repo-x86_64"
|
||||||
svn rm -q "$repo-i686"
|
|
||||||
svn rm -q "$repo-x86_64"
|
svn rm -q "$repo-x86_64"
|
||||||
svn commit -q -m "Removed $repo-i686 and $repo-x86_64 for $pkgname"
|
svn commit -q -m "Removed $repo-x86_64 for $pkgname"
|
||||||
stat_done
|
stat_done
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -4,23 +4,22 @@
|
||||||
|
|
||||||
# shellcheck disable=2034
|
# shellcheck disable=2034
|
||||||
_arch=(
|
_arch=(
|
||||||
i686
|
|
||||||
x86_64
|
x86_64
|
||||||
any
|
any
|
||||||
)
|
)
|
||||||
|
|
||||||
# shellcheck disable=2034
|
# shellcheck disable=2034
|
||||||
_tags=(
|
_tags=(
|
||||||
core-i686 core-x86_64 core-any
|
core-x86_64 core-any
|
||||||
extra-i686 extra-x86_64 extra-any
|
extra-x86_64 extra-any
|
||||||
multilib-x86_64
|
multilib-x86_64
|
||||||
staging-i686 staging-x86_64 staging-any
|
staging-x86_64 staging-any
|
||||||
testing-i686 testing-x86_64 testing-any
|
testing-x86_64 testing-any
|
||||||
multilib-testing-x86_64
|
multilib-testing-x86_64
|
||||||
multilib-staging-x86_64
|
multilib-staging-x86_64
|
||||||
community-i686 community-x86_64 community-any
|
community-x86_64 community-any
|
||||||
community-staging-i686 community-staging-x86_64 community-staging-any
|
community-staging-x86_64 community-staging-any
|
||||||
community-testing-i686 community-testing-x86_64 community-testing-any
|
community-testing-x86_64 community-testing-any
|
||||||
kde-unstable-i686 kde-unstable-x86_64 kde-unstable-any
|
kde-unstable-x86_64 kde-unstable-any
|
||||||
gnome-unstable-i686 gnome-unstable-x86_64 gnome-unstable-any
|
gnome-unstable-x86_64 gnome-unstable-any
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,150 +0,0 @@
|
||||||
#!/hint/bash
|
|
||||||
# shellcheck disable=2034
|
|
||||||
|
|
||||||
#
|
|
||||||
# /etc/makepkg.conf
|
|
||||||
#
|
|
||||||
|
|
||||||
#########################################################################
|
|
||||||
# SOURCE ACQUISITION
|
|
||||||
#########################################################################
|
|
||||||
#
|
|
||||||
#-- The download utilities that makepkg should use to acquire sources
|
|
||||||
# Format: 'protocol::agent'
|
|
||||||
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
|
|
||||||
'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
|
||||||
'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
|
||||||
'rsync::/usr/bin/rsync --no-motd -z %u %o'
|
|
||||||
'scp::/usr/bin/scp -C %u %o')
|
|
||||||
|
|
||||||
# Other common tools:
|
|
||||||
# /usr/bin/snarf
|
|
||||||
# /usr/bin/lftpget -c
|
|
||||||
# /usr/bin/wget
|
|
||||||
|
|
||||||
#-- The package required by makepkg to download VCS sources
|
|
||||||
# Format: 'protocol::package'
|
|
||||||
VCSCLIENTS=('bzr::bzr'
|
|
||||||
'git::git'
|
|
||||||
'hg::mercurial'
|
|
||||||
'svn::subversion')
|
|
||||||
|
|
||||||
#########################################################################
|
|
||||||
# ARCHITECTURE, COMPILE FLAGS
|
|
||||||
#########################################################################
|
|
||||||
#
|
|
||||||
CARCH="i686"
|
|
||||||
CHOST="i686-pc-linux-gnu"
|
|
||||||
|
|
||||||
#-- Compiler and Linker Flags
|
|
||||||
# -march (or -mcpu) builds exclusively for an architecture
|
|
||||||
# -mtune optimizes for an architecture, but builds for whole processor family
|
|
||||||
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
|
||||||
CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
|
||||||
CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
|
||||||
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
|
|
||||||
#-- Make Flags: change this for DistCC/SMP systems
|
|
||||||
#MAKEFLAGS="-j2"
|
|
||||||
#-- Debugging flags
|
|
||||||
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
|
|
||||||
DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
|
|
||||||
|
|
||||||
#########################################################################
|
|
||||||
# BUILD ENVIRONMENT
|
|
||||||
#########################################################################
|
|
||||||
#
|
|
||||||
# Defaults: BUILDENV=(!distcc color !ccache check !sign)
|
|
||||||
# A negated environment option will do the opposite of the comments below.
|
|
||||||
#
|
|
||||||
#-- distcc: Use the Distributed C/C++/ObjC compiler
|
|
||||||
#-- color: Colorize output messages
|
|
||||||
#-- ccache: Use ccache to cache compilation
|
|
||||||
#-- check: Run the check() function if present in the PKGBUILD
|
|
||||||
#-- sign: Generate PGP signature file
|
|
||||||
#
|
|
||||||
BUILDENV=(!distcc color !ccache check !sign)
|
|
||||||
#
|
|
||||||
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
|
|
||||||
#-- specify a space-delimited list of hosts running in the DistCC cluster.
|
|
||||||
#DISTCC_HOSTS=""
|
|
||||||
#
|
|
||||||
#-- Specify a directory for package building.
|
|
||||||
#BUILDDIR=/tmp/makepkg
|
|
||||||
|
|
||||||
#########################################################################
|
|
||||||
# GLOBAL PACKAGE OPTIONS
|
|
||||||
# These are default values for the options=() settings
|
|
||||||
#########################################################################
|
|
||||||
#
|
|
||||||
# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
|
|
||||||
# A negated option will do the opposite of the comments below.
|
|
||||||
#
|
|
||||||
#-- strip: Strip symbols from binaries/libraries
|
|
||||||
#-- docs: Save doc directories specified by DOC_DIRS
|
|
||||||
#-- libtool: Leave libtool (.la) files in packages
|
|
||||||
#-- staticlibs: Leave static library (.a) files in packages
|
|
||||||
#-- emptydirs: Leave empty directories in packages
|
|
||||||
#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
|
|
||||||
#-- purge: Remove files specified by PURGE_TARGETS
|
|
||||||
#-- upx: Compress binary executable files using UPX
|
|
||||||
#-- optipng: Optimize PNG images with optipng
|
|
||||||
#-- debug: Add debugging flags as specified in DEBUG_* variables
|
|
||||||
#
|
|
||||||
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
|
|
||||||
|
|
||||||
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
|
|
||||||
INTEGRITY_CHECK=(md5)
|
|
||||||
#-- Options to be used when stripping binaries. See `man strip' for details.
|
|
||||||
STRIP_BINARIES="--strip-all"
|
|
||||||
#-- Options to be used when stripping shared libraries. See `man strip' for details.
|
|
||||||
STRIP_SHARED="--strip-unneeded"
|
|
||||||
#-- Options to be used when stripping static libraries. See `man strip' for details.
|
|
||||||
STRIP_STATIC="--strip-debug"
|
|
||||||
#-- Manual (man and info) directories to compress (if zipman is specified)
|
|
||||||
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
|
|
||||||
#-- Doc directories to remove (if !docs is specified)
|
|
||||||
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
|
|
||||||
#-- Files to be removed from all packages (if purge is specified)
|
|
||||||
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
|
|
||||||
|
|
||||||
#########################################################################
|
|
||||||
# PACKAGE OUTPUT
|
|
||||||
#########################################################################
|
|
||||||
#
|
|
||||||
# Default: put built package and cached source in build directory
|
|
||||||
#
|
|
||||||
#-- Destination: specify a fixed directory where all packages will be placed
|
|
||||||
#PKGDEST=/home/packages
|
|
||||||
#-- Source cache: specify a fixed directory where source files will be cached
|
|
||||||
#SRCDEST=/home/sources
|
|
||||||
#-- Source packages: specify a fixed directory where all src packages will be placed
|
|
||||||
#SRCPKGDEST=/home/srcpackages
|
|
||||||
#-- Log files: specify a fixed directory where all log files will be placed
|
|
||||||
#LOGDEST=/home/makepkglogs
|
|
||||||
#-- Packager: name/email of the person or organization building packages
|
|
||||||
#PACKAGER="John Doe <john@doe.com>"
|
|
||||||
#-- Specify a key to use for package signing
|
|
||||||
#GPGKEY=""
|
|
||||||
|
|
||||||
#########################################################################
|
|
||||||
# COMPRESSION DEFAULTS
|
|
||||||
#########################################################################
|
|
||||||
#
|
|
||||||
COMPRESSGZ=(gzip -c -f -n)
|
|
||||||
COMPRESSBZ2=(bzip2 -c -f)
|
|
||||||
COMPRESSXZ=(xz -c -z -)
|
|
||||||
COMPRESSLRZ=(lrzip -q)
|
|
||||||
COMPRESSLZO=(lzop -q)
|
|
||||||
COMPRESSZ=(compress -c -f)
|
|
||||||
|
|
||||||
#########################################################################
|
|
||||||
# EXTENSION DEFAULTS
|
|
||||||
#########################################################################
|
|
||||||
#
|
|
||||||
# WARNING: Do NOT modify these variables unless you know what you are
|
|
||||||
# doing.
|
|
||||||
#
|
|
||||||
PKGEXT='.pkg.tar.xz'
|
|
||||||
SRCEXT='.src.tar.gz'
|
|
||||||
|
|
||||||
# vim: set ft=sh ts=2 sw=2 et:
|
|
|
@ -1,4 +1,4 @@
|
||||||
#compdef archbuild archco arch-nspawn archrelease archrm commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-i686-build=archbuild extra-x86_64-build=archbuild testing-i686-build=archbuild testing-x86_64-build=archbuild staging-i686-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-i686-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-i686-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco
|
#compdef archbuild archco arch-nspawn archrelease archrm commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco
|
||||||
# License: Unspecified
|
# License: Unspecified
|
||||||
|
|
||||||
m4_include(lib/valid-tags.sh)
|
m4_include(lib/valid-tags.sh)
|
||||||
|
|
Loading…
Reference in New Issue