Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-07-18 13:12:06 +0200
committerErich Eckner <git@eckner.net>2020-02-20 08:18:02 +0100
commitaf2c45d1ada9870056f11bd3619bcc04c60dea8a (patch)
tree2ca902222a14be2600d9f667b4ac4cd2bb34fd41
parent15ac0e08258ffe363b4cc7d97461e6f60e57e4d5 (diff)
make armv7h, too
-rw-r--r--.gitignore2
-rw-r--r--Makefile26
-rw-r--r--arch-nspawn.in2
-rw-r--r--archbuild.in2
4 files changed, 32 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8dd3239..1f4834f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,9 @@ pacman-*-i486.conf
pacman-*-i686.conf
pacman-*-pentium4.conf
pacman-*-armv6h.conf
+pacman-*-armv7h.conf
makepkg-armv6h.conf
+makepkg-armv7h.conf
makepkg-i486.conf
makepkg-i686.conf
makepkg-pentium4.conf
diff --git a/Makefile b/Makefile
index 392489e..45ae643 100644
--- a/Makefile
+++ b/Makefile
@@ -26,14 +26,17 @@ BINPROGS = \
GENERATED_CONFIGFILES = \
pacman-extra-armv6h.conf \
+ pacman-extra-armv7h.conf \
pacman-extra-i486.conf \
pacman-extra-i686.conf \
pacman-extra-pentium4.conf \
pacman-testing-armv6h.conf \
+ pacman-testing-armv7h.conf \
pacman-testing-i486.conf \
pacman-testing-i686.conf \
pacman-testing-pentium4.conf \
pacman-staging-armv6h.conf \
+ pacman-staging-armv7h.conf \
pacman-staging-i486.conf \
pacman-staging-i686.conf \
pacman-staging-pentium4.conf \
@@ -41,18 +44,22 @@ GENERATED_CONFIGFILES = \
pacman-staging-with-build-support-i686.conf \
pacman-staging-with-build-support-pentium4.conf \
pacman-kde-unstable-armv6h.conf \
+ pacman-kde-unstable-armv7h.conf \
pacman-kde-unstable-i486.conf \
pacman-kde-unstable-i686.conf \
pacman-kde-unstable-pentium4.conf \
pacman-gnome-unstable-armv6h.conf \
+ pacman-gnome-unstable-armv7h.conf \
pacman-gnome-unstable-i486.conf \
pacman-gnome-unstable-i686.conf \
pacman-gnome-unstable-pentium4.conf \
pacman-archlinuxewe-armv6h.conf \
+ pacman-archlinuxewe-armv7h.conf \
pacman-archlinuxewe-i486.conf \
pacman-archlinuxewe-i686.conf \
pacman-archlinuxewe-pentium4.conf \
makepkg-armv6h.conf \
+ makepkg-armv7h.conf \
makepkg-i486.conf \
makepkg-i686.conf \
makepkg-pentium4.conf
@@ -85,16 +92,19 @@ COMMITPKG_LINKS = \
ARCHBUILD_LINKS = \
extra-armv6h-build \
+ extra-armv7h-build \
extra-i486-build \
extra-i686-build \
extra-pentium4-build \
extra-x86_64-build \
testing-armv6h-build \
+ testing-armv7h-build \
testing-i486-build \
testing-i686-build \
testing-pentium4-build \
testing-x86_64-build \
staging-armv6h-build \
+ staging-armv7h-build \
staging-i486-build \
staging-i686-build \
staging-pentium4-build \
@@ -106,16 +116,19 @@ ARCHBUILD_LINKS = \
multilib-testing-build \
multilib-staging-build \
kde-unstable-armv6h-build \
+ kde-unstable-armv7h-build \
kde-unstable-i486-build \
kde-unstable-i686-build \
kde-unstable-pentium4-build \
kde-unstable-x86_64-build \
gnome-unstable-armv6h-build \
+ gnome-unstable-armv7h-build \
gnome-unstable-i486-build \
gnome-unstable-i686-build \
gnome-unstable-pentium4-build \
gnome-unstable-x86_64-build \
archlinuxewe-armv6h-build \
+ archlinuxewe-armv7h-build \
archlinuxewe-i486-build \
archlinuxewe-i686-build \
archlinuxewe-pentium4-build \
@@ -153,6 +166,13 @@ makepkg-armv6h.conf: makepkg-x86_64.conf
s/^\(C\(XX\)\?FLAGS=\).*\$$/\1\"-march=armv6 -mfloat-abi=hard -mfpu=vfp -O2 -pipe -fstack-protector-strong -fno-plt\"/g; \
" "$<" > "$@"
+makepkg-armv7h.conf: makepkg-x86_64.conf
+ @echo "GEN $@"
+ @sed " s/^CARCH=.*\$$/CARCH=\"armv7h\"/g; \
+ s/^CHOST=.*\$$/CHOST=\"armv7l-unknown-linux-gnueabihf\"/g; \
+ s/^\(C\(XX\)\?FLAGS=\).*\$$/\1\"-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt\"/g; \
+ " "$<" > "$@"
+
makepkg-i486.conf: makepkg-x86_64.conf
@echo "GEN $@"
@sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i486\2,g' "$<" > "$@"
@@ -192,6 +212,12 @@ pacman-%-armv6h.conf: pacman-%.conf
/^Architecture = / s/^.*\$$/Architecture = armv6h/; \
" "$<" > "$@"
+pacman-%-armv7h.conf: pacman-%.conf
+ @echo "GEN $@"
+ @sed " \
+ /^Architecture = / s/^.*\$$/Architecture = armv7h/; \
+ " "$<" > "$@"
+
pacman-%-i486.conf: pacman-%.conf
@echo "GEN $@"
@sed " \
diff --git a/arch-nspawn.in b/arch-nspawn.in
index c1397fe..0830d2e 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -130,6 +130,8 @@ if [[ "${CARCH}" = 'pentium4' ]]; then
set_arch='i686'
elif [[ "${CARCH}" = 'armv6h' ]]; then
set_arch='armv6l'
+elif [[ "${CARCH}" = 'armv7h' ]]; then
+ set_arch='armv7l'
else
set_arch="${CARCH}"
fi
diff --git a/archbuild.in b/archbuild.in
index bbbd254..ef59073 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -21,6 +21,8 @@ if [[ "${arch}" == 'pentium4' ]]; then
set_arch='i686'
elif [[ "${arch}" == 'armv6h' ]]; then
set_arch='armv6l'
+elif [[ "${arch}" == 'armv7h' ]]; then
+ set_arch='armv7l'
else
set_arch="${arch}"
fi