From 4c0f878b6ab7f5294b292f5009fe546836089e8c Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 18 Jul 2019 10:32:13 +0200 Subject: do not patch makepkg.conf, but export stuff to env --- archPackagesUpdate | 42 ++++++++++++++++-------------------------- makepkg-armv6h.patch | 22 ---------------------- makepkg-i686.patch | 20 -------------------- makepkg-pentium4.patch | 19 ------------------- makepkgSystem.patch | 21 --------------------- 5 files changed, 16 insertions(+), 108 deletions(-) delete mode 100644 makepkg-armv6h.patch delete mode 100644 makepkg-i686.patch delete mode 100644 makepkg-pentium4.patch delete mode 100644 makepkgSystem.patch diff --git a/archPackagesUpdate b/archPackagesUpdate index 2b369b1bc..4d188a054 100755 --- a/archPackagesUpdate +++ b/archPackagesUpdate @@ -11,6 +11,10 @@ pkgSrcDir="$(dirname $(readlink -f -n "$0"))" [ "${pkgSrcDir}" == "${HOME}" ] && \ aufRechenknecht=true || \ aufRechenknecht=false +if ${aufRechenknecht}; then + export SRCDEST="${HOME}/packageSources" + export PACKAGER='Erich Eckner ' +fi branch="HEAD" force=false upload=true @@ -415,32 +419,18 @@ if ${aufRechenknecht}; then maxErr=0 -# generate current makepkg.conf, makepkg-i686.conf and makepkg-pentium4.conf - cp /etc/makepkg.conf . - if ! patch -p0 -i makepkgSystem.patch; then - cleanUp - exit 1 - fi - sed 's|^\(BUILDENV=.*[^!]\)sign|\1!sign|' -i makepkg.conf - - eval "$( - grep '^SRCDEST=' makepkg.conf - )" - - if [ -n "${SRCDEST}" ]; then - # update git sources - find "${SRCDEST}" -mindepth 2 -maxdepth 2 -name 'HEAD' | \ - sed 's|/[^/]*$||' | \ - while read -r repo; do - git -C "${repo}" fetch --all -p - done - # update svn sources - find "${SRCDEST}" -mindepth 2 -maxdepth 2 -name '.svn' | \ - sed 's|/[^/]*$||' | \ - while read -r repo; do - svn update "${repo}" - done - fi + # update git sources + find "${SRCDEST}" -mindepth 2 -maxdepth 2 -name 'HEAD' | \ + sed 's|/[^/]*$||' | \ + while read -r repo; do + git -C "${repo}" fetch --all -p + done + # update svn sources + find "${SRCDEST}" -mindepth 2 -maxdepth 2 -name '.svn' | \ + sed 's|/[^/]*$||' | \ + while read -r repo; do + svn update "${repo}" + done # build packages for ((i=0; i<${#pakete[@]}; i++)); do diff --git a/makepkg-armv6h.patch b/makepkg-armv6h.patch deleted file mode 100644 index add1ec48e..000000000 --- a/makepkg-armv6h.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- makepkg-armv6h.conf 2019-06-25 15:12:24.844496578 +0200 -+++ makepkg-armv6h.conf 2019-07-10 11:36:24.033616088 +0200 -@@ -32,13 +32,15 @@ - # ARCHITECTURE, COMPILE FLAGS - ######################################################################### - # --CARCH="x86_64" --CHOST="x86_64-pc-linux-gnu" -+CARCH="armv6h" -+CHOST="armv6l-unknown-linux-gnueabihf" - - #-- 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=x86-64 -mtune=generic -O2 -pipe -fno-plt" --CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt" -+CFLAGS="-march=armv6 -mfloat-abi=hard -mfpu=vfp -O2 -pipe -fstack-protector-strong -fno-plt" -+CXXFLAGS="-march=armv6 -mfloat-abi=hard -mfpu=vfp -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" diff --git a/makepkg-i686.patch b/makepkg-i686.patch deleted file mode 100644 index 3068e3186..000000000 --- a/makepkg-i686.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- makepkg-i686.conf 2018-05-30 08:38:02.885358183 +0200 -+++ makepkg-i686.conf 2018-05-30 08:40:25.575856939 +0200 -@@ -32,13 +32,13 @@ - # ARCHITECTURE, COMPILE FLAGS - ######################################################################### - # --CARCH="x86_64" --CHOST="x86_64-pc-linux-gnu" -+CARCH="i686" -+CHOST="i686-pc-linux-gnu" - - #-- Compiler and Linker Flags - CPPFLAGS="-D_FORTIFY_SOURCE=2" --CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt" --CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt" -+CFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe -fno-plt" -+CXXFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe -fno-plt" - LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" - #-- Make Flags: change this for DistCC/SMP systems - MAKEFLAGS="-j4" diff --git a/makepkg-pentium4.patch b/makepkg-pentium4.patch deleted file mode 100644 index ef949440f..000000000 --- a/makepkg-pentium4.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- makepkg-pentium4.conf 2019-04-13 17:03:11.540419301 +0200 -+++ makepkg-pentium4.conf 2019-04-13 17:04:45.040742728 +0200 -@@ -32,13 +32,13 @@ - # ARCHITECTURE, COMPILE FLAGS - ######################################################################### - # --CARCH="i686" -+CARCH="pentium4" - CHOST="i686-pc-linux-gnu" - - #-- Compiler and Linker Flags - CPPFLAGS="-D_FORTIFY_SOURCE=2" --CFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe -fno-plt" --CXXFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe -fno-plt" -+CFLAGS="-m32 -march=pentium4 -mtune=generic -O2 -pipe -fno-plt" -+CXXFLAGS="-m32 -march=pentium4 -mtune=generic -O2 -pipe -fno-plt" - LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" - #-- Make Flags: change this for DistCC/SMP systems - MAKEFLAGS="-j4" diff --git a/makepkgSystem.patch b/makepkgSystem.patch deleted file mode 100644 index b16fe8796..000000000 --- a/makepkgSystem.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- makepkg.conf 2018-05-30 08:38:22.167804726 +0200 -+++ makepkg.conf 2018-05-30 08:38:02.885358183 +0200 -@@ -113,15 +113,15 @@ - #-- 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 -+SRCDEST='/home/makepkg/packageSources' - #-- 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="Erich Eckner " -+PACKAGER='Erich Eckner ' - #-- Specify a key to use for package signing --#GPGKEY="" -+GPGKEY='5FDCA472AB93292BC678FD59255A76DB9A12601A' - - ######################################################################### - # COMPRESSION DEFAULTS -- cgit v1.2.3-54-g00ecf