Commit 01359038 authored by Javier Jardón's avatar Javier Jardón Committed by Freedesktop SDK Merge Bot

Build targeting i686 architecture

parent 1c98ba0e
......@@ -24,7 +24,7 @@ stages:
- flatpak
- vm
- publish_x86_64
- publish_i586
- publish_i686
- publish_aarch64
- publish_arm
......@@ -129,13 +129,13 @@ app_x86_64:
variables:
ARCH: x86_64
app_i586:
app_i686:
image: $DOCKER_BST_AMD64
<<: *flatpak_definition
tags:
- x86_64
variables:
ARCH: i586
ARCH: i686
app_aarch64:
image: $DOCKER_BST_AARCH64
......@@ -230,14 +230,14 @@ publish_x86_64:
variables:
ARCH: x86_64
publish_i586:
stage: publish_i586
publish_i686:
stage: publish_i686
image: $DOCKER_BST_AMD64
<<: *flatpak_runtimes_publish
tags:
- x86_64
variables:
ARCH: i586
ARCH: i686
publish_aarch64:
stage: publish_aarch64
......
......@@ -69,7 +69,7 @@ For more information on git commit messages see [this guide](https://chris.beams
## Request developer access to the freedesktop-sdk repo
Go to our gitlab [project page](https://gitlab.com/freedesktop-sdk/freedesktop-sdk) and click the "Request Developer Access" button near the top of the page. One of the maintainers will review your request. Developer access allows you to push directly to our repo, enabling a simpler "push and merge request" workflow instead of using the github "fork and pull request" workflow.
This has the added benefit of allowing you to use our CI, which is equipped with runners for aarch64, armv7, i586 and x86_64 architectures.
This has the added benefit of allowing you to use our CI, which is equipped with runners for aarch64, armv7, i686 and x86_64 architectures.
## Push your changes to the remote
Run the following commands:
......
BRANCH=18.08
ARCH=$(shell uname -m | sed "s/^i.86$$/i586/")
ifeq ($(ARCH),i586)
ARCH=$(shell uname -m | sed "s/^i.86$$/i686/")
ifeq ($(ARCH),i686)
FLATPAK_ARCH=i386
else
FLATPAK_ARCH=$(ARCH)
......@@ -22,7 +22,7 @@ RUNTIMES= \
glxinfo \
glxinfo-debug \
rust
ifeq ($(ARCH),$(filter $(ARCH),i586 x86_64))
ifeq ($(ARCH),$(filter $(ARCH),i686 x86_64))
RUNTIMES+=platform-vaapi
endif
RUNTIME_ELEMENTS=$(addprefix flatpak-images/,$(addsuffix .bst,$(RUNTIMES)))
......@@ -50,7 +50,7 @@ export:
set -e; case "$(RUNTIMES)" in \
*platform-arch-libs*) \
if test "$(ARCH)" = "i586" ; then \
if test "$(ARCH)" = "i686" ; then \
flatpak build-commit-from $(GPG_OPTS) --src-ref=runtime/org.freedesktop.Platform.Compat.$(FLATPAK_ARCH)/$(FLATPAK_ARCH)/$(BRANCH) $(REPO) runtime/org.freedesktop.Platform.Compat.$(FLATPAK_ARCH)/x86_64/$(BRANCH); \
flatpak build-commit-from $(GPG_OPTS) --src-ref=runtime/org.freedesktop.Platform.Compat.$(FLATPAK_ARCH).Debug/$(FLATPAK_ARCH)/$(BRANCH) $(REPO) runtime/org.freedesktop.Platform.Compat.$(FLATPAK_ARCH).Debug/x86_64/$(BRANCH); \
elif test "$(ARCH)" = "arm" ; then \
......
......@@ -11,7 +11,7 @@ variables:
(?):
- target_arch == "x86_64":
vpxtarget: "x86_64-linux-gcc"
- target_arch == "i586":
- target_arch == "i686":
vpxtarget: "x86-linux-gcc"
- target_arch == "arm":
vpxtarget: "armv7-linux-gcc"
......
......@@ -18,7 +18,7 @@ variables:
builddir: ''
openssl-target: linux-%{arch}
(?):
- target_arch == "i586":
- target_arch == "i686":
openssl-target: linux-generic32
- target_arch == "arm":
openssl-target: linux-generic32
......
......@@ -9,7 +9,7 @@ depends:
variables:
openssl-target: linux-%{arch}
(?):
- target_arch == "i586":
- target_arch == "i686":
openssl-target: linux-generic32
- target_arch == "arm":
openssl-target: linux-generic32
......
......@@ -6,7 +6,7 @@ depends:
variables:
target: "linux_noasm"
(?):
- target_arch == "i586":
- target_arch == "i686":
target: "linux_asm"
config:
......
......@@ -23,7 +23,7 @@ variables:
ffmpeg-libdir: "%{libdir}"
ffmpeg-arch: "%{arch}"
(?):
- target_arch == "i586":
- target_arch == "i686":
ffmpeg-arch: x86
conf-local: |
......
......@@ -8,7 +8,7 @@ depends:
variables:
(?):
- target_arch == "i586":
- target_arch == "i686":
targets: "X86;AMDGPU;NVPTX"
- target_arch == "x86_64":
targets: "X86;AMDGPU;NVPTX"
......
......@@ -28,7 +28,7 @@ depends:
variables:
(?):
- target_arch == "i586" or target_arch == "x86_64":
- target_arch == "i686" or target_arch == "x86_64":
gallium_drivers: "svga,swrast,nouveau,r600,r300,radeonsi,virgl"
dri_drivers: "nouveau,r100,r200,i915,i965"
vulkan_drivers: "intel,amd"
......
......@@ -18,7 +18,7 @@ sources:
- target_arch == "x86_64":
url: https://static.rust-lang.org/dist/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz
ref: a5e7749767c47669ed9b6e32c6fb8eda6b0fe1c63ac73a6d4666b5c1352bad24
- target_arch == "i586":
- target_arch == "i686":
url: https://static.rust-lang.org/dist/cargo-0.29.0-i686-unknown-linux-gnu.tar.gz
ref: ec9ba3aa064719222bb59de4cf8f2ad061bb31288e7dd4e98b80215203aa5876
- target_arch == "aarch64":
......
......@@ -18,7 +18,7 @@ sources:
- target_arch == "x86_64":
url: https://static.rust-lang.org/dist/rust-1.28.0-x86_64-unknown-linux-gnu.tar.gz
ref: 2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810
- target_arch == "i586":
- target_arch == "i686":
url: https://static.rust-lang.org/dist/rust-1.28.0-i686-unknown-linux-gnu.tar.gz
ref: de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f
- target_arch == "aarch64":
......
......@@ -20,7 +20,7 @@ variables:
debuginfo-only-std: "false"
rust-target: "%{host-triplet}"
(?):
- target_arch == "i586":
- target_arch == "i686":
# i686 also exhausts memory on stage0
debuginfo-only-std: "true"
- target_arch == "arm":
......
......@@ -2,6 +2,6 @@ kind: stack
description: holds Intel specific elements
(?):
- target_arch == "i586" or target_arch == "x86_64":
- target_arch == "i686" or target_arch == "x86_64":
depends:
- filename: flatpak-images/platform-vaapi-intel.bst
......@@ -6,7 +6,7 @@ depends:
- vm/bsp-generic/linux.bst
(?):
- target_arch in ["i586", "x86_64"]:
- target_arch in ["i686", "x86_64"]:
depends:
(>):
- vm/bsp-generic/syslinux.bst
......@@ -19,9 +19,9 @@ variables:
(?):
- target_arch == "aarch64":
kernel_arch: arm64
- target_arch == "i586":
- target_arch == "i686":
kernel_arch: i386
- target_arch != "aarch64" and target_arch != "i586":
- target_arch != "aarch64" and target_arch != "i686":
kernel_arch: '%{arch}'
config:
......
......@@ -50,12 +50,12 @@ variables:
abi: "gnu"
common_flags: "-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches"
flags_x86_64: "-march=x86-64 -mtune=generic %{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection"
flags_i586: "%{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection"
flags_i686: "%{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection"
flags_aarch64: "%{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection"
flags_arm: "%{common_flags}"
ldflags_defaults: "-Wl,--as-needed,-z,relro,-z,now"
(?):
- target_arch == "i586":
- target_arch == "i686":
gcc_arch: "i386"
- target_arch == "arm":
abi: "gnueabihf"
......@@ -111,9 +111,9 @@ environment:
CFLAGS: "%{flags_x86_64}"
CXXFLAGS: "%{flags_x86_64}"
LDFLAGS: "%{ldflags_defaults}"
- target_arch == "i586":
CFLAGS: "%{flags_i586}"
CXXFLAGS: "%{flags_i586}"
- target_arch == "i686":
CFLAGS: "%{flags_i686}"
CXXFLAGS: "%{flags_i686}"
LDFLAGS: "%{ldflags_defaults}"
- target_arch == "arm":
CFLAGS: "%{flags_arm}"
......@@ -177,7 +177,7 @@ options:
values:
- arm
- aarch64
- i586
- i686
- x86_64
target_arch:
......@@ -187,7 +187,7 @@ options:
values:
- arm
- aarch64
- i586
- i686
- x86_64
artifacts:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment