Fix build.sh exports and add empty platform verison 1.0
parent
489386bcd6
commit
e046243b95
|
@ -5,13 +5,13 @@ CONF_PATH=`dirname $0`
|
||||||
if [ -z "$NO_32BIT" ]; then
|
if [ -z "$NO_32BIT" ]; then
|
||||||
flatpak-builder $2 --arch=i386 build32 "$CONF_PATH/Base$1-i386.yaml" || exit 1
|
flatpak-builder $2 --arch=i386 build32 "$CONF_PATH/Base$1-i386.yaml" || exit 1
|
||||||
if [ ! -z $3 ]; then
|
if [ ! -z $3 ]; then
|
||||||
flatpak-builder $4 --arch=i386 --export-only "--repo=$3" build32 "$CONF_PATH/Base$1-i386.yaml" || exit 3
|
flatpak-builder $4 --arch=i386 --export-only --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build32 "$CONF_PATH/Base$1-i386.yaml" || exit 3
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ -z "$NO_64BIT" ]; then
|
if [ -z "$NO_64BIT" ]; then
|
||||||
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Platform.Compat.i386/x86_64/18.08 > "$CONF_PATH/i386.tar" &&
|
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Platform.Compat.i386/x86_64/18.08 > "$CONF_PATH/i386.tar" &&
|
||||||
flatpak-builder $2 --arch=x86_64 build64 "$CONF_PATH/Base$1-x86_64.yaml" || exit 2
|
flatpak-builder $2 --arch=x86_64 build64 "$CONF_PATH/Base$1-x86_64.yaml" || exit 2
|
||||||
if [ ! -z $3 ]; then
|
if [ ! -z $3 ]; then
|
||||||
flatpak-builder $4 --arch=x86_64 --export-only "--repo=$3" build64 "$CONF_PATH/Base$1-x86_64.yaml" || exit 3
|
flatpak-builder $4 --arch=x86_64 --export-only --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build64 "$CONF_PATH/Base$1-x86_64.yaml" || exit 3
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
build-runtime: true
|
||||||
|
writable-sdk: true
|
||||||
|
|
||||||
|
id: de.marko10_000.winebarrels.Platform
|
||||||
|
branch: "v1.0"
|
||||||
|
|
||||||
|
sdk: de.marko10_000.winebarrels.BaseSdk
|
||||||
|
runtime: de.marko10_000.winebarrels.BasePlatform
|
||||||
|
runtime-version: "v1"
|
||||||
|
separate-locales: false
|
||||||
|
|
||||||
|
inherit-extensions:
|
||||||
|
- org.freedesktop.Platform.GL
|
||||||
|
- org.freedesktop.Platform.Timezones
|
||||||
|
- org.freedesktop.Platform.GStreamer
|
||||||
|
- org.freedesktop.Platform.Icontheme
|
||||||
|
- org.gtk.Gtk3theme
|
||||||
|
- org.freedesktop.Platform.VAAPI.Intel
|
||||||
|
- org.freedesktop.Platform.html5-codecs
|
||||||
|
|
||||||
|
modules:
|
||||||
|
- name: test-arch
|
||||||
|
buildsystem: simple
|
||||||
|
build-commands:
|
||||||
|
- false
|
||||||
|
skip-arches:
|
||||||
|
- "i386"
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
- "*.a"
|
||||||
|
- "*.la"
|
||||||
|
- /include
|
||||||
|
- /lib/debug
|
||||||
|
- /share/man
|
|
@ -0,0 +1,35 @@
|
||||||
|
build-runtime: true
|
||||||
|
writable-sdk: true
|
||||||
|
|
||||||
|
id: de.marko10_000.winebarrels.Platform
|
||||||
|
branch: "v1.0"
|
||||||
|
|
||||||
|
sdk: de.marko10_000.winebarrels.BaseSdk
|
||||||
|
runtime: de.marko10_000.winebarrels.BasePlatform
|
||||||
|
runtime-version: "v1"
|
||||||
|
separate-locales: false
|
||||||
|
|
||||||
|
inherit-extensions:
|
||||||
|
- org.freedesktop.Platform.GL
|
||||||
|
- org.freedesktop.Platform.Timezones
|
||||||
|
- org.freedesktop.Platform.GStreamer
|
||||||
|
- org.freedesktop.Platform.Icontheme
|
||||||
|
- org.gtk.Gtk3theme
|
||||||
|
- org.freedesktop.Platform.VAAPI.Intel
|
||||||
|
- org.freedesktop.Platform.html5-codecs
|
||||||
|
- org.freedesktop.Platform.GL32
|
||||||
|
|
||||||
|
modules:
|
||||||
|
- name: test-arch
|
||||||
|
buildsystem: simple
|
||||||
|
build-commands:
|
||||||
|
- false
|
||||||
|
skip-arches:
|
||||||
|
- x86_64
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
- "*.a"
|
||||||
|
- "*.la"
|
||||||
|
- /include
|
||||||
|
- /lib/debug
|
||||||
|
- /share/man
|
|
@ -0,0 +1,32 @@
|
||||||
|
build-runtime: true
|
||||||
|
writable-sdk: true
|
||||||
|
|
||||||
|
id: de.marko10_000.winebarrels.Sdk
|
||||||
|
branch: "v1.0"
|
||||||
|
|
||||||
|
sdk: de.marko10_000.winebarrels.BaseSdk
|
||||||
|
runtime: de.marko10_000.winebarrels.BaseSdk
|
||||||
|
runtime-version: "v1"
|
||||||
|
separate-locales: false
|
||||||
|
|
||||||
|
inherit-extensions:
|
||||||
|
- org.freedesktop.Platform.GL
|
||||||
|
- org.freedesktop.Platform.Timezones
|
||||||
|
- org.freedesktop.Platform.GStreamer
|
||||||
|
- org.freedesktop.Platform.Icontheme
|
||||||
|
- org.gtk.Gtk3theme
|
||||||
|
- org.freedesktop.Platform.html5-codecs
|
||||||
|
- org.freedesktop.Sdk.Extension
|
||||||
|
- org.freedesktop.Platform.VAAPI.Intel
|
||||||
|
|
||||||
|
modules:
|
||||||
|
- name: test-arch
|
||||||
|
buildsystem: simple
|
||||||
|
build-commands:
|
||||||
|
- false
|
||||||
|
skip-arches:
|
||||||
|
- "i386"
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
- /lib/debug
|
||||||
|
- /share/man
|
|
@ -0,0 +1,33 @@
|
||||||
|
build-runtime: true
|
||||||
|
writable-sdk: true
|
||||||
|
|
||||||
|
id: de.marko10_000.winebarrels.Sdk
|
||||||
|
branch: "v1.0"
|
||||||
|
|
||||||
|
sdk: de.marko10_000.winebarrels.BaseSdk
|
||||||
|
runtime: de.marko10_000.winebarrels.BaseSdk
|
||||||
|
runtime-version: "v1"
|
||||||
|
separate-locales: false
|
||||||
|
|
||||||
|
inherit-extensions:
|
||||||
|
- org.freedesktop.Platform.GL
|
||||||
|
- org.freedesktop.Platform.Timezones
|
||||||
|
- org.freedesktop.Platform.GStreamer
|
||||||
|
- org.freedesktop.Platform.Icontheme
|
||||||
|
- org.gtk.Gtk3theme
|
||||||
|
- org.freedesktop.Platform.html5-codecs
|
||||||
|
- org.freedesktop.Sdk.Extension
|
||||||
|
- org.freedesktop.Platform.VAAPI.Intel
|
||||||
|
- org.freedesktop.Platform.GL32
|
||||||
|
|
||||||
|
modules:
|
||||||
|
- name: test-arch
|
||||||
|
buildsystem: simple
|
||||||
|
build-commands:
|
||||||
|
- false
|
||||||
|
skip-arches:
|
||||||
|
- x86_64
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
- /lib/debug
|
||||||
|
- /share/man
|
|
@ -0,0 +1,18 @@
|
||||||
|
#! /usr/bin/env bash
|
||||||
|
|
||||||
|
CONF_PATH=`dirname $0`
|
||||||
|
|
||||||
|
if [ -z "$NO_32BIT" ]; then
|
||||||
|
if [ -z $3 ]; then
|
||||||
|
flatpak-builder $2 --arch=i386 build32 "$CONF_PATH/$1-i386.yaml" || exit 1
|
||||||
|
else
|
||||||
|
flatpak-builder $2 --arch=i386 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build32 "$CONF_PATH/$1-i386.yaml" || exit 2
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if [ -z "$NO_64BIT" ]; then
|
||||||
|
if [ -z $3 ]; then
|
||||||
|
flatpak-builder $2 --arch=x86_64 build64 "$CONF_PATH/$1-x86_64.yaml" || exit 2
|
||||||
|
else
|
||||||
|
flatpak-builder $2 --arch=x86_64 --gpg-sign=winebarrels@marko10-000.de "--repo=$3" build64 "$CONF_PATH/$1-x86_64.yaml" || exit 2
|
||||||
|
fi
|
||||||
|
fi
|
Loading…
Reference in New Issue