From 4b7c68fcdf97a05aff1e3294ecaa058334bb8a17 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 6 May 2020 18:10:52 +0200 Subject: [PATCH] spec: simplify module inclusion code Now that as a result of commit 4d2f15f all symlinks have been dropped from the individual module paths, the search for module contents can be simplified again. --- osbuild.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/osbuild.spec b/osbuild.spec index 5e1af788..496e3e65 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -74,16 +74,16 @@ make man %py3_install mkdir -p %{buildroot}%{pkgdir}/stages -install -p -m 0755 $(find stages/* -not -path "*/osbuild") %{buildroot}%{pkgdir}/stages/ +install -p -m 0755 $(find stages -type f) %{buildroot}%{pkgdir}/stages/ mkdir -p %{buildroot}%{pkgdir}/assemblers -install -p -m 0755 $(find assemblers/* -not -path "*/osbuild") %{buildroot}%{pkgdir}/assemblers/ +install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/ mkdir -p %{buildroot}%{pkgdir}/runners -install -p -m 0755 $(find runners/* -not -path "*/osbuild") %{buildroot}%{pkgdir}/runners +install -p -m 0755 $(find runners -type f -or -type l) %{buildroot}%{pkgdir}/runners mkdir -p %{buildroot}%{pkgdir}/sources -install -p -m 0755 $(find sources/* -not -path "*/osbuild") %{buildroot}%{pkgdir}/sources +install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources # mount point for bind mounting the osbuild library mkdir -p %{buildroot}%{pkgdir}/osbuild