Attachment 123481 Details for Bug 95274 – Generate/subst metadata in the makefile

Generate/subst metadata in the makefile

0005-Generate-metadata-from-make-variables.patch (text/plain), 2.99 KB, created by Tristan Van Berkom on 2016-05-04 23:29:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tristan Van Berkom

Created: 2016-05-04 23:29:48 UTC

Size: 2.99 KB

patch

obsolete

>From 40d05c719f01d30e9c975e6175782cf3bd71721a Mon Sep 17 00:00:00 2001
>From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
>Date: Mon, 11 Apr 2016 16:34:21 +0100
>Subject: [PATCH 5/7] Generate metadata from make variables.
>
>Now one must invoke make with, for example:
>
>  make ARCH=i686 VERSION=2.0
>
>The metadata files will be regenerated on every
>invocation of make.
>---
> Makefile             | 30 +++++++++++++++++++++++++++---
> metadata.platform    |  4 ----
> metadata.platform.in |  4 ++++
> metadata.sdk         |  4 ----
> metadata.sdk.in      |  4 ++++
> 5 files changed, 35 insertions(+), 11 deletions(-)
> delete mode 100644 metadata.platform
> create mode 100644 metadata.platform.in
> delete mode 100644 metadata.sdk
> create mode 100644 metadata.sdk.in
>
>diff --git a/Makefile b/Makefile
>index b146816..0fb5ccd 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -1,9 +1,22 @@
>+#
>+# Usage:
>+#
>+#   make ARCH=i686 VERSION=1.6
>+#
>+# ARCH:    The machine architecture you want to build for
>+# VERSION: The version (branch) of runtime and sdk to produce
>+#
>+ifndef ARCH
>+$(error ARCH is not set)
>+endif
>+
>+ifndef VERSION
>+$(error VERSION is not set)
>+endif
>+
> srcdir = $(CURDIR)
> builddir = $(CURDIR)
>-
> NULL=
>-ARCH=x86_64
>-VERSION=1.5
> HASH:=$(shell git rev-parse HEAD)
> IMAGEDIR=images/${ARCH}
> SDK_IMAGE=${IMAGEDIR}/freedesktop-contents-sdk-${ARCH}-${HASH}.tar.gz
>@@ -50,3 +63,14 @@ ${FILE_REF_PLATFORM}: metadata.platform ${PLATFORM_IMAGE}
> 	ostree commit ${COMMIT_ARGS} ${GPG_ARGS} --branch=${REF_PLATFORM}  -s "build of ${HASH}" platform
> 	ostree summary -u --repo=repo ${GPG_ARGS}
> 	rm -rf platform
>+
>+METADATA_FILES=metadata.sdk metadata.platform
>+${METADATA_FILES}: metadata_FORCE
>+
>+%:%.in
>+	sed -e 's/@@ARCH@@/${ARCH}/g' \
>+	    -e 's/@@VERSION@@/${VERSION}/g' \
>+	    $< > $@.tmp && mv $@.tmp $@ || exit 1
>+
>+# force the files to be rebuilt every make invocation
>+metadata_FORCE:
>diff --git a/metadata.platform b/metadata.platform
>deleted file mode 100644
>index c2ca72e..0000000
>--- a/metadata.platform
>+++ /dev/null
>@@ -1,4 +0,0 @@
>-[Runtime]
>-name=org.freedesktop.BasePlatform
>-runtime=org.freedesktop.BasePlatform/x86_64/1.5
>-sdk=org.freedesktop.BaseSdk/x86_64/1.5
>diff --git a/metadata.platform.in b/metadata.platform.in
>new file mode 100644
>index 0000000..b46703a
>--- /dev/null
>+++ b/metadata.platform.in
>@@ -0,0 +1,4 @@
>+[Runtime]
>+name=org.freedesktop.BasePlatform
>+runtime=org.freedesktop.BasePlatform/@@ARCH@@/@@VERSION@@
>+sdk=org.freedesktop.BaseSdk/@@ARCH@@/@@VERSION@@
>diff --git a/metadata.sdk b/metadata.sdk
>deleted file mode 100644
>index a0b520e..0000000
>--- a/metadata.sdk
>+++ /dev/null
>@@ -1,4 +0,0 @@
>-[Runtime]
>-name=org.freedesktop.BaseSdk
>-runtime=org.freedesktop.BasePlatform/x86_64/1.5
>-sdk=org.freedesktop.BaseSdk/x86_64/1.5
>diff --git a/metadata.sdk.in b/metadata.sdk.in
>new file mode 100644
>index 0000000..f69621d
>--- /dev/null
>+++ b/metadata.sdk.in
>@@ -0,0 +1,4 @@
>+[Runtime]
>+name=org.freedesktop.BaseSdk
>+runtime=org.freedesktop.BasePlatform/@@ARCH@@/@@VERSION@@
>+sdk=org.freedesktop.BaseSdk/@@ARCH@@/@@VERSION@@
>-- 
>2.7.4
>

Actions: View

Attachments on bug 95274: 123481 | 123528 | 123628 | 123632

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.