From 3cfa9a602a810bbcbc15ea3b1df31e3013031181 Mon Sep 17 00:00:00 2001 From: Marko Semet Date: Sat, 10 Nov 2018 14:21:49 +0100 Subject: [PATCH] Raw- and BaseSdk/Platform --- BaseSdk-x86_64.yaml | 20 ++++++++++++++++++++ RawPlatform-x84_64.yaml | 21 +++++++++++++++++++++ RawSdk-x84_64.yaml | 22 ++++++++++++++++++++++ tools/add-libs.yaml | 9 +++++++++ tools/is-x86_64.yaml | 6 ++++++ tools/ld-links.py | 20 ++++++++++++++++++++ tools/ld-update.yaml | 8 ++++++++ 7 files changed, 106 insertions(+) create mode 100644 BaseSdk-x86_64.yaml create mode 100644 RawPlatform-x84_64.yaml create mode 100644 RawSdk-x84_64.yaml create mode 100644 tools/add-libs.yaml create mode 100644 tools/is-x86_64.yaml create mode 100755 tools/ld-links.py create mode 100644 tools/ld-update.yaml diff --git a/BaseSdk-x86_64.yaml b/BaseSdk-x86_64.yaml new file mode 100644 index 0000000..c65fb05 --- /dev/null +++ b/BaseSdk-x86_64.yaml @@ -0,0 +1,20 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.BaseSdk +id-platform: de.marko10_000.winebarrels.BasePlatform +branch: wb-uno + +sdk: de.marko10_000.winebarrels.RawSdk +runtime: de.marko10_000.winebarrels.RawPlatform +runtime-version: wb-raw-uno + + +inherit-extensions: + - de.marko10_000.winebarrels.RawPlatform +inherit-sdk-extensions: + - de.marko10_000.winebarrels.RawSdk + +modules: + - tools/is-x86_64.yaml + - tools/ld-update.yaml diff --git a/RawPlatform-x84_64.yaml b/RawPlatform-x84_64.yaml new file mode 100644 index 0000000..79cc342 --- /dev/null +++ b/RawPlatform-x84_64.yaml @@ -0,0 +1,21 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.RawPlatform +branch: wb-raw-uno + +sdk: org.gnome.Platform +runtime: org.gnome.Platform +runtime-version: 3.30 + + +add-extensions: + org.freedesktop.Platform.Compat.i386: + directory: lib/i386 + remove-after-build: false + bundle: false + version: 18.08 + +modules: + - tools/is-x86_64.yaml + - tools/add-libs.yaml diff --git a/RawSdk-x84_64.yaml b/RawSdk-x84_64.yaml new file mode 100644 index 0000000..5283bca --- /dev/null +++ b/RawSdk-x84_64.yaml @@ -0,0 +1,22 @@ +build-runtime: true +writable-sdk: true + +id: de.marko10_000.winebarrels.RawSdk +id-platform: de.marko10_000.winebarrels.RawPlatform +branch: wb-raw-uno + +sdk: org.gnome.Sdk +runtime: org.gnome.Sdk +runtime-version: 3.30 + + +add-extensions: + org.freedesktop.Platform.Compat.i386: + directory: lib/i386 + remove-after-build: false + bundle: false + version: 18.08 + +modules: + - tools/is-x86_64.yaml + - tools/add-libs.yaml diff --git a/tools/add-libs.yaml b/tools/add-libs.yaml new file mode 100644 index 0000000..3a7a625 --- /dev/null +++ b/tools/add-libs.yaml @@ -0,0 +1,9 @@ +name: addLibs +buildsystem: simple +build-commands: + - mkdir /usr/lib/i386 + - mkdir /usr/lib/gl_i386 + - echo /usr/lib/i386 >> /etc/ld.so.conf + - echo /usr/lib/gl-i386 >> /etc/ld.so.conf +only-arches: + - x86_64 diff --git a/tools/is-x86_64.yaml b/tools/is-x86_64.yaml new file mode 100644 index 0000000..1b451ce --- /dev/null +++ b/tools/is-x86_64.yaml @@ -0,0 +1,6 @@ +name: check-arch +buildsystem: simple +build-commands: + - false +skip-arches: + - x86_64 diff --git a/tools/ld-links.py b/tools/ld-links.py new file mode 100755 index 0000000..ab23903 --- /dev/null +++ b/tools/ld-links.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python3 +import os +import sys +import re + + +_match = re.compile("^(?P.*/[^.]*)\\.[0-9]*\\.so$") + + +def link_when_match(path): + tmp = _match.match(path) + if tmp: + tmp = tmp.groupdict() + os.symlink(path, tmp["path"] + ".so") + print("Link: " + tmp["path"] + ".so") + + +if __name__ == '__main__': + for i in os.listdir(sys.argv[1]): + link_when_match(os.path.join(sys.argv[1], i)) diff --git a/tools/ld-update.yaml b/tools/ld-update.yaml new file mode 100644 index 0000000..ef8625a --- /dev/null +++ b/tools/ld-update.yaml @@ -0,0 +1,8 @@ +name: ld-update +sources: + - type: file + path: ld-links.py +buildsystem: simple +build-commands: + - ls -la /usr/lib/i386 + - ./ld-links.py /usr/lib/i386