summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHéctor Orón Martínez <hector.oron@collabora.co.uk>2013-05-17 09:02:37 (GMT)
committerHéctor Orón Martínez <hector.oron@collabora.co.uk>2014-02-17 13:45:03 (GMT)
commit8744c1fe76fd56deee8596db2b4c4d0f535127c5 (patch)
tree0502491da612cd1e8cb00b8762d18d8fce50bead
parent3428d97f0c9ab2ef0753bbf339519f0677c4d257 (diff)
downloadobs-build-8744c1fe76fd56deee8596db2b4c4d0f535127c5.tar.gz
obs-build-8744c1fe76fd56deee8596db2b4c4d0f535127c5.tar.xz
Add support for armv6hl architecture
Signed-off-by: Héctor Orón Martínez <hector.oron@collabora.co.uk>
-rw-r--r--Build.pm4
-rw-r--r--Build/Deb.pm1
-rwxr-xr-xbuild2
-rwxr-xr-xinit_buildsystem2
4 files changed, 5 insertions, 4 deletions
diff --git a/Build.pm b/Build.pm
index 123b18f..7e124c4 100644
--- a/Build.pm
+++ b/Build.pm
@@ -34,8 +34,8 @@ sub import {
my $std_macros = q{
%define nil
%define ix86 i386 i486 i586 i686 athlon
-%define arm armv4l armv5l armv6l armv7l armv4b armv5l armv5b armv5el armv5eb armv5tel armv5teb armv6el armv6eb armv7el armv7eb armv7hl armv7nhl armv8el
-%define arml armv4l armv5l armv6l armv7l armv5tel armv5el armv6el armv7el armv7hl armv7nhl armv8el
+%define arm armv4l armv5l armv6l armv7l armv4b armv5l armv5b armv5el armv5eb armv5tel armv5teb armv6el armv6hl armv6eb armv7el armv7eb armv7hl armv7nhl armv8el
+%define arml armv4l armv5l armv6l armv7l armv5tel armv5el armv6el armv6hl armv7el armv7hl armv7nhl armv8el
%define armb armv4b armv5b armv5teb armv5eb armv6eb armv7eb
%define sparc sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
};
diff --git a/Build/Deb.pm b/Build/Deb.pm
index a7d9c77..a1bf866 100644
--- a/Build/Deb.pm
+++ b/Build/Deb.pm
@@ -18,6 +18,7 @@ my %obs2debian = (
"armv4l" => "armel",
"armv5l" => "armel",
"armv6l" => "armel",
+ "armv6hl" => "armhf"
"armv7l" => "armel",
"armv7hl" => "armhf"
);
diff --git a/build b/build
index bc6bcc1..87fe623 100755
--- a/build
+++ b/build
@@ -92,7 +92,7 @@ SIGNDUMMY=
HOST_ARCH=
# list of archs which need emulator initialization
-: ${EMULATOR_ARCHS:="armv4l armv5l armv6l armv7l armv5el armv6el armv7el armv7hl armv8el mips mipsel mips64 mips64el ppc ppc64 sh4 sparc sparc64 s390 s390x"}
+: ${EMULATOR_ARCHS:="armv4l armv5l armv6l armv7l armv5el armv6el armv7el armv6hl armv7hl armv8el mips mipsel mips64 mips64el ppc ppc64 sh4 sparc sparc64 s390 s390x"}
export EMULATOR_ARCHS
# list of devices registered by binfmt handlers in /proc/sys/fs/binfmt_misc
diff --git a/init_buildsystem b/init_buildsystem
index 2f43df1..abcce5f 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -777,7 +777,7 @@ if test ! -f $BUILD_ROOT/var/lib/rpm/packages.rpm -a ! -f $BUILD_ROOT/var/lib/rp
i[456]86*) DEBOOT_ARCH="i386" ;;
ppc*) DEBOOT_ARCH="powerpc" ;;
x86_64*) DEBOOT_ARCH="amd64" ;;
- armv7hl*) DEBOOT_ARCH="armhf" ;;
+ armv[67]hl*) DEBOOT_ARCH="armhf" ;;
armv[4567]l*) DEBOOT_ARCH="armel" ;;
*)
echo "Unknown architecture"