From 3231cf8c364ff0c9473131314baaf6aee4bc9169 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Fri, 25 Sep 2015 13:03:16 +0200 Subject: Layer gnome-unstable above staging, not testing --- pacman-gnome-unstable.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pacman-gnome-unstable.conf b/pacman-gnome-unstable.conf index 911d4db..ff905fe 100644 --- a/pacman-gnome-unstable.conf +++ b/pacman-gnome-unstable.conf @@ -72,6 +72,9 @@ LocalFileSigLevel = Optional [gnome-unstable] Include = /etc/pacman.d/mirrorlist +[staging] +Include = /etc/pacman.d/mirrorlist + [testing] Include = /etc/pacman.d/mirrorlist @@ -81,6 +84,9 @@ Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist +[community-staging] +Include = /etc/pacman.d/mirrorlist + [community-testing] Include = /etc/pacman.d/mirrorlist -- cgit v1.2.3-70-g09d2 From 393b9757cf74fd969675d50e14977cf842a19512 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Fri, 2 Oct 2015 14:59:52 +0300 Subject: Sync makepkg.conf files with pacman 4.2.1-4 --- makepkg-i686.conf | 11 +++++------ makepkg-x86_64.conf | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/makepkg-i686.conf b/makepkg-i686.conf index 64ddd67..ac54d07 100644 --- a/makepkg-i686.conf +++ b/makepkg-i686.conf @@ -19,7 +19,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % # /usr/bin/lftpget -c # /usr/bin/wget -#-- The the package required by makepkg to download VCS sources +#-- The package required by makepkg to download VCS sources # Format: 'protocol::package' VCSCLIENTS=('bzr::bzr' 'git::git' @@ -37,8 +37,8 @@ CHOST="i686-pc-linux-gnu" # -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 --param=ssp-buffer-size=4" -CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" +CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong" +CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" @@ -50,17 +50,16 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign) +# Defaults: BUILDENV=(!distcc color !ccache check !sign) # A negated environment option will do the opposite of the comments below. # -#-- fakeroot: Allow building packages as a non-root user #-- 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=(fakeroot !distcc color !ccache check !sign) +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. diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index cf14784..415231a 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -19,7 +19,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % # /usr/bin/lftpget -c # /usr/bin/wget -#-- The the package required by makepkg to download VCS sources +#-- The package required by makepkg to download VCS sources # Format: 'protocol::package' VCSCLIENTS=('bzr::bzr' 'git::git' @@ -37,8 +37,8 @@ CHOST="x86_64-unknown-linux-gnu" # -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=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" -CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong" +CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" @@ -50,17 +50,16 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign) +# Defaults: BUILDENV=(!distcc color !ccache check !sign) # A negated environment option will do the opposite of the comments below. # -#-- fakeroot: Allow building packages as a non-root user #-- 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=(fakeroot !distcc color !ccache check !sign) +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. -- cgit v1.2.3-70-g09d2 From ba45e06d3e7cb4547bf2de4ccf24aad69a3b31b6 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Fri, 2 Oct 2015 15:02:45 +0300 Subject: Bump version to 20151002 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dcdb522..8fe4bea 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20150606 +V=20151002 PREFIX = /usr/local -- cgit v1.2.3-70-g09d2 From 5a7890f0768810c81e32dcb31627eb41e2ee41fd Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Sun, 29 Nov 2015 11:57:32 +0200 Subject: arch-nspawn: preserve systemd-nspawn's stderr It is passed down to the container when stdin/stdout is not a tty; this is the case when archbuild's output is redirected to a pipe or file. --- arch-nspawn.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 19f1410..357d950 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -96,7 +96,7 @@ copy_hostconf eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") -exec ${CARCH:+setarch "$CARCH"} systemd-nspawn 2>/dev/null \ +exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ -D "$working_dir" \ --register=no \ "${mount_args[@]}" \ -- cgit v1.2.3-70-g09d2 From 38957783a2bf3da42de6c0be37caf8a7ba763d84 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Sun, 29 Nov 2015 12:06:58 +0200 Subject: Bump version to 20151129 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8fe4bea..ce2b042 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20151002 +V=20151129 PREFIX = /usr/local -- cgit v1.2.3-70-g09d2