From 2bfd373d6d164865c0ebc75700362fa81b53bd84 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 13 Apr 2022 19:15:49 +0100 Subject: [PATCH] selinux: Factor out build steps into a script This will make them easier to share between Autotools and Meson. Signed-off-by: Simon McVittie --- selinux/Makefile.am.inc | 10 +++------- selinux/build-selinux.sh | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) create mode 100755 selinux/build-selinux.sh diff --git a/selinux/Makefile.am.inc b/selinux/Makefile.am.inc index 5d8af975..fab55558 100644 --- a/selinux/Makefile.am.inc +++ b/selinux/Makefile.am.inc @@ -5,19 +5,15 @@ selinux_module_DATA = $(NULL) selinux_develdir = ${datadir}/selinux/devel/include/contrib selinux_devel_DATA = $(NULL) -flatpak.pp.bz2: selinux/flatpak.te selinux/flatpak.fc - $(eval TMP := $(shell mktemp -d selinux-build-XXXXXX)) - cp $^ $(TMP)/ - cd $(TMP) && make -f /usr/share/selinux/devel/Makefile flatpak.pp - bzip2 -9 $(TMP)/flatpak.pp - cp $(TMP)/flatpak.pp.bz2 . - rm -rf $(TMP) +flatpak.pp.bz2: selinux/flatpak.te selinux/flatpak.fc selinux/build-selinux.sh + $(srcdir)/selinux/build-selinux.sh . $^ selinux_module_DATA += flatpak.pp.bz2 selinux_devel_DATA += selinux/flatpak.if endif EXTRA_DIST += \ + selinux/build-selinux.sh \ selinux/flatpak.te \ selinux/flatpak.fc \ selinux/flatpak.if \ diff --git a/selinux/build-selinux.sh b/selinux/build-selinux.sh new file mode 100755 index 00000000..9b8d1a01 --- /dev/null +++ b/selinux/build-selinux.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# Copyright 2019 Red Hat Inc. +# Copyright 2022 Collabora Ltd. +# SPDX-License-Identifier: LGPL-2.1-or-later + +set -eu + +TMP=$(mktemp -d selinux-build-XXXXXX) +output="$1" +shift +cp -- "$@" "$TMP/" + +make -C "$TMP" -f /usr/share/selinux/devel/Makefile flatpak.pp +bzip2 -9 "$TMP/flatpak.pp" +cp "$TMP/flatpak.pp.bz2" "$output" +rm -fr "$TMP"