Fix: Base v2 broken symbol links
parent
9f67721768
commit
d64c6404ac
|
@ -39,6 +39,3 @@ cleanup-platform:
|
||||||
- /lib/pkgconfig
|
- /lib/pkgconfig
|
||||||
- /lib/x86_64-linux-gnu/pkgconfig
|
- /lib/x86_64-linux-gnu/pkgconfig
|
||||||
- /lib32/pkgconfig
|
- /lib32/pkgconfig
|
||||||
- /share/doc
|
|
||||||
- /share/info
|
|
||||||
- /share/man
|
|
||||||
|
|
|
@ -7,33 +7,40 @@ if [ -z "$BUILD_DIR_64BIT" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$NO_REBUILD_I386" ]; then
|
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
|
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Platform.Compat.i386/x86_64/19.08 > "$CONF_PATH/i386.tar" || exit 1
|
||||||
fi
|
fi
|
||||||
if [ -z "$2" ]; then
|
if [ -z "$2" ]; then
|
||||||
if [ -z "$NO_PLATFORM" ]; then
|
if [ -z "$NO_PLATFORM" ]; then
|
||||||
if [ -z "$NO_REBUILD_LOCALE" ]; 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
|
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
|
||||||
fi
|
fi
|
||||||
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/RawPlatform-x86_64.yaml" || exit 3
|
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/RawPlatform-x86_64.yaml" || exit 3
|
||||||
fi
|
fi
|
||||||
if [ -z "$NO_SDK" ]; then
|
if [ -z "$NO_SDK" ]; then
|
||||||
if [ -z "$NO_REBUILD_LOCALE" ]; 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
|
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Sdk.Locale/x86_64/19.08 > "$CONF_PATH/locale.tar" || exit 4
|
||||||
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Sdk.Docs/x86_64/19.08 > "$CONF_PATH/docs.tar" || exit 5
|
|
||||||
fi
|
fi
|
||||||
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/RawSdk-x86_64.yaml" || exit 6
|
flatpak-builder $1 --rebuild-on-sdk-change --arch=x86_64 "$BUILD_DIR_64BIT" "$CONF_PATH/RawSdk-x86_64.yaml" || exit 6
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ -z "$NO_PLATFORM" ]; then
|
if [ -z "$NO_PLATFORM" ]; then
|
||||||
if [ -z "$NO_REBUILD_LOCALE" ]; 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
|
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
|
||||||
fi
|
fi
|
||||||
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
|
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
|
fi
|
||||||
if [ -z "$NO_SDK" ]; then
|
if [ -z "$NO_SDK" ]; then
|
||||||
if [ -z "$NO_REBUILD_LOCALE" ]; 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
|
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Sdk.Locale/x86_64/19.08 > "$CONF_PATH/locale.tar" || exit 4
|
||||||
ostree export --repo ~/.local/share/flatpak/repo runtime/org.freedesktop.Sdk.Docs/x86_64/19.08 > "$CONF_PATH/docs.tar" || exit 5
|
|
||||||
fi
|
fi
|
||||||
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
|
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
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
name: docs-sdk
|
||||||
|
sources:
|
||||||
|
- type: archive
|
||||||
|
path: ../docs.tar
|
||||||
|
dest: docs
|
||||||
|
buildsystem: simple
|
||||||
|
build-commands:
|
||||||
|
- rm -v /usr/share/ri && cp -rav docs/ri /usr/share && rm -rvf docs/ri
|
||||||
|
- rm -v /usr/share/cmake-3.15/Help && mkdir /usr/share/cmake-3.15/Help && cp -rav docs/cmake-3.15/* /usr/share/cmake-3.15/Help && rm -rvf docs/cmake-3.15
|
||||||
|
- cp -rav docs /usr/share/runtime
|
||||||
|
only-arches:
|
||||||
|
- x86_64
|
|
@ -8,9 +8,6 @@ build-commands:
|
||||||
- rm -v /usr/share/doc && cp -rav docs/doc /usr/share && rm -rvf docs/doc
|
- rm -v /usr/share/doc && cp -rav docs/doc /usr/share && rm -rvf docs/doc
|
||||||
- rm -v /usr/share/info && cp -rav docs/info /usr/share && rm -rvf docs/info
|
- rm -v /usr/share/info && cp -rav docs/info /usr/share && rm -rvf docs/info
|
||||||
- rm -v /usr/share/man && cp -rav docs/man /usr/share && rm -rvf docs/man
|
- rm -v /usr/share/man && cp -rav docs/man /usr/share && rm -rvf docs/man
|
||||||
- rm -v /usr/share/ri && cp -rav docs/ri /usr/share && rm -rvf docs/ri
|
|
||||||
- rm -v /usr/share/gtk-doc/html && cp -rav docs/gtk-doc/html /usr/share/gtk-doc && rm -rvf docs/gtk-doc
|
- rm -v /usr/share/gtk-doc/html && cp -rav docs/gtk-doc/html /usr/share/gtk-doc && rm -rvf docs/gtk-doc
|
||||||
- rm -v /usr/share/cmake-3.15/Help && mkdir /usr/share/cmake-3.15/Help && cp -rav docs/cmake-3.15/* /usr/share/cmake-3.15/Help && rm -rvf docs/cmake-3.15
|
|
||||||
- cp -rav docs /usr/share/runtime
|
|
||||||
only-arches:
|
only-arches:
|
||||||
- x86_64
|
- x86_64
|
|
@ -12,5 +12,6 @@ build-commands:
|
||||||
- echo /usr/lib32/GL >> /etc/ld.so.conf
|
- echo /usr/lib32/GL >> /etc/ld.so.conf
|
||||||
- rm -rfv /lib/i386-linux-gnu
|
- rm -rfv /lib/i386-linux-gnu
|
||||||
- ln -s /usr/lib32 /lib/i386-linux-gnu
|
- ln -s /usr/lib32 /lib/i386-linux-gnu
|
||||||
|
- ln -s /usr/lib32 /usr/lib/lib32
|
||||||
only-arches:
|
only-arches:
|
||||||
- x86_64
|
- x86_64
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
name: meta-platform
|
name: meta-platform
|
||||||
modules:
|
modules:
|
||||||
- libs.yaml
|
- libs.yaml
|
||||||
- locale.yaml
|
- locale.yaml
|
||||||
|
- docs.yaml
|
|
@ -1,4 +1,4 @@
|
||||||
name: meta-sdk
|
name: meta-sdk
|
||||||
modules:
|
modules:
|
||||||
- fix-libs.yaml
|
- fix-libs.yaml
|
||||||
- docs.yaml
|
- docs-sdk.yaml
|
|
@ -93,6 +93,8 @@ modules:
|
||||||
builddir: true
|
builddir: true
|
||||||
post-install:
|
post-install:
|
||||||
- make -k -j$FLATPAK_BUILDER_N_JOBS check || true
|
- make -k -j$FLATPAK_BUILDER_N_JOBS check || true
|
||||||
|
cleanup-platform:
|
||||||
|
- /bin
|
||||||
- name: cross-gcc-pass1
|
- name: cross-gcc-pass1
|
||||||
sources: &GCC_SOURCES
|
sources: &GCC_SOURCES
|
||||||
- &GCC_SOURCE
|
- &GCC_SOURCE
|
||||||
|
@ -286,6 +288,7 @@ modules:
|
||||||
- install
|
- install
|
||||||
builddir: true
|
builddir: true
|
||||||
post-install: &GCC_POST_INSTALL
|
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
|
- cp -rav /usr/tmp/usr/* /usr && rm -rf /usr/tmp
|
||||||
- make -j$FLATPAK_BUILDER_N_JOBS check || true
|
- make -j$FLATPAK_BUILDER_N_JOBS check || true
|
||||||
- rm -v /lib/cpp
|
- rm -v /lib/cpp
|
||||||
|
|
Loading…
Reference in New Issue