flatpaks
/
WineBarrels-BasePlatforms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BasePlatform v2 with gnome 3.34

master
Marko Semet 2020-01-20 00:23:37 +01:00
parent 11557ce713
commit 56b52846af
7 changed files with 197 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BasePlatform/v2/RawPlatform-x86_64.yaml
View File

@ -4,9 +4,9 @@ writable-sdk: true
id: de.marko10_000.winebarrels.RawPlatform
branch: "v2"
sdk: org.freedesktop.Platform
runtime: org.freedesktop.Platform
runtime-version: "19.08"
sdk: org.gnome.Platform
runtime: org.gnome.Platform
runtime-version: "3.34"
separate-locales: false
add-extensions:

6
BasePlatform/v2/RawSdk-x86_64.yaml
View File

@ -4,9 +4,9 @@ writable-sdk: true
id: de.marko10_000.winebarrels.RawSdk
branch: "v2"
sdk: org.freedesktop.Sdk
runtime: org.freedesktop.Sdk
runtime-version: "19.08"
sdk: org.gnome.Sdk
runtime: org.gnome.Sdk
runtime-version: "3.34"
separate-locales: false
add-extensions:

32
BasePlatform/v2/build.raw.sh
View File

@ -7,41 +7,45 @@ if [ -z "$BUILD_DIR_64BIT" ]; then
fi
if [ -z "$NO_REBUILD_I386" ]; then
echo EXPORT: runtime/org.freedesktop.Platform.Compat.i386/x86_64/19.08
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Platform.Compat.i386/x86_64/19.08 > "$CONF_PATH/i386.tar" || exit 1
echo EXPORT: runtime/org.gnome.Platform.Compat.i386/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Compat.i386/x86_64/3.34 > "$CONF_PATH/i386.tar" || exit 1
fi
if [ -z "$2" ]; then
if [ -z "$NO_PLATFORM" ]; then
if [ -z "$NO_REBUILD_LOCALE" ]; then
echo EXPORT: runtime/org.freedesktop.Platform.Locale/x86_64/19.08
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Platform.Locale/x86_64/19.08 > "$CONF_PATH/locale.tar" || exit 2
echo EXPORT: runtime/org.freedesktop.Sdk.Docs/x86_64/19.08
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Sdk.Docs/x86_64/19.08 > "$CONF_PATH/docs.tar" || exit 5
echo EXPORT: runtime/org.gnome.Platform.Locale/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Locale/x86_64/3.34 > "$CONF_PATH/locale.tar" || exit 2
echo EXPORT: runtime/org.gnome.Sdk.Docs/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Docs/x86_64/3.34 > "$CONF_PATH/docs.tar" || exit 5
fi
echo BUILD: Runtime
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/RawPlatform-x86_64.yaml" || exit 3
fi
if [ -z "$NO_SDK" ]; then
if [ -z "$NO_REBUILD_LOCALE" ]; then
echo EXPORT: runtime/org.freedesktop.Sdk.Locale/x86_64/19.08
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Sdk.Locale/x86_64/19.08 > "$CONF_PATH/locale.tar" || exit 4
echo EXPORT: runtime/org.gnome.Sdk.Locale/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Locale/x86_64/3.34 > "$CONF_PATH/locale.tar" || exit 4
fi
echo BUILD: Sdk
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/RawSdk-x86_64.yaml" || exit 6
fi
else
if [ -z "$NO_PLATFORM" ]; then
if [ -z "$NO_REBUILD_LOCALE" ]; then
echo EXPORT: runtime/org.freedesktop.Platform.Locale/x86_64/19.08
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Platform.Locale/x86_64/19.08 > "$CONF_PATH/locale.tar" || exit 2
echo EXPORT: runtime/org.freedesktop.Sdk.Docs/x86_64/19.08
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Sdk.Docs/x86_64/19.08 > "$CONF_PATH/docs.tar" || exit 5
echo EXPORT: runtime/org.gnome.Platform.Locale/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Platform.Locale/x86_64/3.34 > "$CONF_PATH/locale.tar" || exit 2
echo EXPORT: runtime/org.gnome.Sdk.Docs/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Docs/x86_64/3.34 > "$CONF_PATH/docs.tar" || exit 5
fi
echo BUILD: Runtime
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" "$BUILD_DIR_64BIT" "$CONF_PATH/RawPlatform-x86_64.yaml" || exit 3
fi
if [ -z "$NO_SDK" ]; then
if [ -z "$NO_REBUILD_LOCALE" ]; then
echo EXPORT: runtime/org.freedesktop.Sdk.Locale/x86_64/19.08
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Sdk.Locale/x86_64/19.08 > "$CONF_PATH/locale.tar" || exit 4
echo EXPORT: runtime/org.gnome.Sdk.Locale/x86_64/3.34
ostree export --repo ~/.local/share/flatpak/repo runtime/org.gnome.Sdk.Locale/x86_64/3.34 > "$CONF_PATH/locale.tar" || exit 4
fi
echo BUILD: Sdk
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$2" "$BUILD_DIR_64BIT" "$CONF_PATH/RawSdk-x86_64.yaml" || exit 6
fi
fi

11
BasePlatform/v2/install.raw.sh
View File

@ -1,9 +1,10 @@
#! /usr/bin/env bash
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo &&
flatpak install -y --noninteractive --user flathub org.freedesktop.Platform/x86_64/19.08 &&
flatpak install -y --noninteractive --user flathub org.freedesktop.Platform.Locale/x86_64/19.08 &&
flatpak install -y --noninteractive --user flathub org.freedesktop.Sdk/x86_64/19.08 &&
flatpak install -y --noninteractive --user flathub org.freedesktop.Sdk.Docs/x86_64/19.08 &&
flatpak install -y --noninteractive --user flathub org.freedesktop.Sdk.Locale/x86_64/19.08 &&
flatpak install -y --noninteractive --user flathub org.gnome.Platform/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Platform.Compat.i386/x86_64/3.34
flatpak install -y --noninteractive --user flathub org.gnome.Platform.Locale/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk.Docs/x86_64/3.34 &&
flatpak install -y --noninteractive --user flathub org.gnome.Sdk.Locale/x86_64/3.34 &&
flatpak update -y --noninteractive --user

123
BasePlatform/v2/platform/gcc-base.yaml 100644
View File

@ -0,0 +1,123 @@
name: gcc-base-meta
modules:
- name: cross-gmp
sources:
- type: archive
url: https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz
sha256: 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
config-opts:
- --disable-static
- --enable-assert
- --enable-cxx
- --enable-fat
- --enable-maintainer-mode
- --enable-shared
- --with-gnu-ld
builddir: true
build-options:
cflags: -flto
cxxflags: -flto
post-install:
- make -j$FLATPAK_BUILDER_N_JOBS check || true
- name: cross-mpfr
sources:
- type: archive
url: https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz
sha256: 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a
config-opts:
- --disable-static
- --enable-assert
- --enable-dependency-tracking
- --enable-maintainer-mode
- --enable-shared-cache
- --enable-shared
- --enable-thread-safe
- --enable-warnings
- --with-gnu-ld
builddir: true
build-options:
cflags: -flto
cxxflags: -flto
post-install:
- make -j$FLATPAK_BUILDER_N_JOBS check || true
- name: cross-mpc
sources:
- type: archive
url: https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
sha256: 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
config-opts:
- --disable-static
- --enable-dependency-tracking
- --enable-maintainer-mode
- --enable-shared
- --with-gnu-ld
builddir: true
build-options:
cflags: -flto
cxxflags: -flto
post-install:
- make -j$FLATPAK_BUILDER_N_JOBS check || true
- name: cross-libs-fix1
buildsystem: simple
build-commands:
- libtool --finish /usr/lib/x86_64-linux-gnu
only-arches:
- x86_64
- name: cross-binutils
sources:
- type: archive
url: https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.xz
sha256: ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
config-opts:
- --host=x86_64-unknown-linux
- --build=x86_64-unknown-linux
- --target=x86_64-unknown-linux
- --disable-libdecnumber
- --disable-readline
- --disable-sim
- --disable-werror
- --enable-64-bit-bfd
- --enable-deterministic-archives
- --enable-gold
- --enable-ld=default
- --enable-lto
- --enable-multiarch
- --enable-multilib
- --enable-plugins
- --enable-relro=yes
- --enable-shared
- --enable-static
- --enable-static-pie
- --enable-targets=x86_64-pep
- --enable-vtable-verify
- --with-system-zlib
- --with-lib-path=/usr/lib:/usr/lib32:/usr/lib/x86_64-linux-gnu:/usr/lib64:/app/lib:/app/lib32:/app/lib64
builddir: true
post-install:
- make -k -j$FLATPAK_BUILDER_N_JOBS check || true
cleanup-platform:
- /bin
only-arches:
- x86_64
- name: cross-prepare-glibc
sources:
- type: archive
url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.2.1.tar.xz
sha256: 3581e84e9d63298a14c147f925cd496ebb25c5a08cf065ba63c54cdee6d86506
dest: kernel_headers
buildsystem: simple
build-commands:
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS mrproper
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS headers_check
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS INSTALL_HDR_PATH=/usr/tmp ARCH=x86_64 headers_install
- cp -raPv /usr/tmp/include /usr && rm -rf /usr/tmp
only-arches:
- x86_64
cleanup-platform:
- "*"
- name: todo-32bit
buildsystem: simple
build-commands:
- "false"
only-arches:
- i386

3
BasePlatform/v2/platform/platform.yaml
View File

@ -1,2 +1,3 @@
name: meta-platform
modules: []
modules:
- gcc-base.yaml

164
BasePlatform/v2/sdk/cross.yaml
View File

@ -2,99 +2,6 @@ name: cross
only-arches:
- x86_64
modules:
- name: cross-gmp
sources:
- type: archive
url: https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz
sha256: 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
config-opts:
- --host=x86_64-unknown-linux
- --build=x86_64-unknown-linux
- --target=x86_64-unknown-linux
- --disable-static
- --enable-assert
- --enable-cxx
- --enable-fat
- --enable-maintainer-mode
- --enable-shared
- --with-gnu-ld
builddir: true
post-install:
- make -j$FLATPAK_BUILDER_N_JOBS check
- name: cross-mpfr
sources:
- type: archive
url: https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz
sha256: 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a
config-opts:
- --host=x86_64-unknown-linux
- --build=x86_64-unknown-linux
- --target=x86_64-unknown-linux
- --disable-static
- --enable-assert
- --enable-dependency-tracking
- --enable-maintainer-mode
- --enable-shared-cache
- --enable-shared
- --enable-thread-safe
- --enable-warnings
- --with-gnu-ld
builddir: true
post-install:
- make -j$FLATPAK_BUILDER_N_JOBS check
- name: cross-mpc
sources:
- type: archive
url: https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
sha256: 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
config-opts:
- --host=x86_64-unknown-linux
- --build=x86_64-unknown-linux
- --target=x86_64-unknown-linux
- --disable-static
- --enable-dependency-tracking
- --enable-maintainer-mode
- --enable-shared
- --with-gnu-ld
builddir: true
post-install:
- make -j$FLATPAK_BUILDER_N_JOBS check
- name: cross-libs-fix1
buildsystem: simple
build-commands:
- libtool --finish /usr/lib/x86_64-linux-gnu
- name: cross-binutils
sources:
- type: archive
url: https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.xz
sha256: ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
config-opts:
- --host=x86_64-unknown-linux
- --build=x86_64-unknown-linux
- --target=x86_64-unknown-linux
- --disable-libdecnumber
- --disable-readline
- --disable-sim
- --disable-werror
- --enable-64-bit-bfd
- --enable-gold
- --enable-ld=default
- --enable-lto
- --enable-multiarch
- --enable-multilib
- --enable-plugins
- --enable-relro=yes
- --enable-shared
- --enable-static
- --enable-static-pie
- --enable-targets=x86_64-pep
- --with-system-zlib
- --with-lib-path=/usr/lib:/usr/lib32:/usr/lib/x86_64-linux-gnu:/usr/lib64:/app/lib:/app/lib32:/app/lib64
builddir: true
post-install:
- make -k -j$FLATPAK_BUILDER_N_JOBS check || true
cleanup-platform:
- /bin
- name: cross-gcc-pass1
sources: &GCC_SOURCES
- &GCC_SOURCE
@ -128,31 +35,22 @@ modules:
- --enable-linker-build-id
- --enable-lto
- --enable-multilib
- --libdir=/usr/lib
- --with-glibc-version=2.30
- --with-newlib
- --with-system-zlib
- --without-headers
- --without-isl
builddir: true
build-options:
no-debuginfo: true
no-debuginfo-compression: true
post-install:
- rm -v /lib/cpp
cleanup-platform: &GCC_CLEANUP_PLATFORM
- /bin
- /libexec/gcc
- /share
- name: cross-prepare-glibc
sources:
- type: archive
url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.2.1.tar.xz
sha256: 3581e84e9d63298a14c147f925cd496ebb25c5a08cf065ba63c54cdee6d86506
dest: kernel_headers
buildsystem: simple
build-commands:
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS mrproper
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS headers_check
- cd kernel_headers; make -j$FLATPAK_BUILDER_N_JOBS INSTALL_HDR_PATH=/usr/tmp ARCH=x86_64 headers_install
- cp -rav /usr/tmp/include /usr && rm -rf /usr/tmp
- rm -v /usr/share/info/dir
- name: cross-glibc-32bit-pass1
sources: &GLIBC_SOURCE_32BIT
- type: archive
@ -170,26 +68,30 @@ modules:
- --enable-bind-now
- --enable-cet
- --enable-multi-arch
- --enable-obsolete-nsl
- --enable-shared
- --enable-stack-protector=strong
- --enable-stackguard-randomization
- --enable-static
- --enable-static-pie
- --enable-tunables
- --libdir=/usr/lib32
- --libexecdir=/usr/lib32
- CC=/usr/bin/gcc -m32
- CXX=/usr/bin/g++ -m32
- CFLAGS=-D_FORTIFY_SOURCE=0 -O2
- CPPFLAGS=-D_FORTIFY_SOURCE=0 -O2
- CC=/usr/bin/gcc -m32
- CXX=/usr/bin/g++ -m32
- is_selinux_enabled=false
build-options: &GLIBC_BUILD_OPTIONS_32BIT
make-install-args:
- install_root=/usr/tmp
- install
cflags: -D_FORTIFY_SOURCE=0 -O3
cflags-override: true
cxxflags: -D_FORTIFY_SOURCE=0 -O3
cxxflags-override: true
post-install: &GLIBC_POST_INSTALL_32BIT
- rm -rvf /usr/tmp/usr/bin /usr/tmp/usr/sbin /usr/tmp/usr/lib /usr/tmp/usr/share
- find "/usr/tmp/usr/include" -type f -not -name '*-32.h' -delete
- cp -rav /usr/tmp/usr/* /usr/ && rm -rf /usr/tmp
- cp -raPv /usr/tmp/usr/* /usr/ && rm -rf /usr/tmp
builddir: true
- name: cross-glibc-64bit-pass1
sources: &GLIBC_SOURCE_64BIT
@ -209,23 +111,25 @@ modules:
- --enable-bind-now
- --enable-cet
- --enable-multi-arch
- --enable-obsolete-nsl
- --enable-shared
- --enable-stack-protector=strong
- --enable-stackguard-randomization
- --enable-static
- --enable-static-pie
- CC=/usr/bin/gcc
- CXX=/usr/bin/g++
- CFLAGS=-D_FORTIFY_SOURCE=0 -O2
- CPPFLAGS=-D_FORTIFY_SOURCE=0 -O2
- --enable-tunables
- is_selinux_enabled=false
build-options: &GLIBC_BUILD_OPTIONS_64BIT
make-install-args:
- install_root=/usr/tmp
- install
cflags: -D_FORTIFY_SOURCE=0 -O3
cflags-override: true
cxxflags: -D_FORTIFY_SOURCE=0 -O3
cxxflags-override: true
post-install: &GLIBC_POST_INSTALL_64BIT
- mv -v /usr/tmp/usr/sbin/* /usr/tmp/usr/bin && rm -rf /usr/tmp/usr/sbin
- cp -rav /usr/tmp/usr/* /usr && cp -rav /usr/tmp/etc/* /etc && rm -rf /usr/tmp
- cp -raPv /usr/tmp/usr/* /usr && cp -rav /usr/tmp/etc/* /etc && rm -rf /usr/tmp
builddir: true
- name: cross-test
buildsystem: simple
@ -257,8 +161,6 @@ modules:
- --enable-multilib
- --enable-shared
- --enable-static
- CC=/usr/bin/gcc
- CXX=/usr/bin/g++
builddir: true
post-install:
- make -j$FLATPAK_BUILDER_N_JOBS check
@ -269,33 +171,47 @@ modules:
- --host=x86_64-unknown-linux
- --build=x86_64-unknown-linux
- --target=x86_64-unknown-linux
- --enable-__cxa_atexit
- --enable-bootstrap
- --enable-default-pie
- --enable-default-ssp
- --enable-languages=c,c++,lto
- --enable-libstdcxx-time=yes
- --enable-libstdcxx-filesystem-ts=yes
- --enable-linker-build-id
- --enable-lto
- --enable-multiarch
- --enable-multilib
- --enable-plugin
- --enable-shared
- --enable-static
- --enable-vtable-verify
- --libdir=/usr/lib
- --without-isl
- CC=/usr/bin/gcc
- CXX=/usr/bin/g++
builddir: true
build-options: &GCC_BUILD_OPTIONS
make-install-args:
- DESTDIR=/usr/tmp
- install
builddir: true
no-debuginfo: true
no-debuginfo-compression: true
post-install: &GCC_POST_INSTALL
- cp -rav /usr/tmp/usr/lib/lib32 /usr & rm -rf /usr/tmp/usr/lib/lib32
- cp -rav /usr/tmp/usr/* /usr && rm -rf /usr/tmp
- make -j$FLATPAK_BUILDER_N_JOBS check || true
- rm -v /lib/cpp
cleanup-platform: *GCC_CLEANUP_PLATFORM
- name: cross-test2
buildsystem: simple
build-commands: *TESTS
build-commands:
- cp -rad /usr/tmp/usr/* /usr/ && rm -rf /usr/tmp # Fixes strange bug
- echo "int main() { return 0; }" > test.c
- gcc test.c
- ./a.out
- gcc -m64 test.c
- ./a.out
- gcc -m32 test.c
- ./a.out
- name: cross-glibc-32bit-pass2
sources: *GLIBC_SOURCE_32BIT
config-opts: *GLIBC_CONFIG_32BIT
@ -315,6 +231,10 @@ modules:
builddir: true
post-install: *GCC_POST_INSTALL
cleanup-platform: *GCC_CLEANUP_PLATFORM
- name: cross-move-gcc
buildsystem: simple
build-commands:
- cp -rad /usr/tmp/usr/* /usr/ && rm -rf /usr/tmp # Fixes strange bug
- name: cross-glibc-32bit
sources: *GLIBC_SOURCE_32BIT
config-opts: *GLIBC_CONFIG_32BIT