[fedora-productimg-server/f21] correctly pregenerate product.img cpio archive

Matthew Miller mattdm at fedoraproject.org
Wed Nov 26 13:58:27 UTC 2014


commit 22c79674d061557f3142cd8d9f4c6c8861d01814
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Wed Nov 26 08:58:17 2014 -0500

    correctly pregenerate product.img cpio archive

 fedora-productimg-server.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/fedora-productimg-server.spec b/fedora-productimg-server.spec
index 5dfaeff..1415b7f 100644
--- a/fedora-productimg-server.spec
+++ b/fedora-productimg-server.spec
@@ -3,7 +3,7 @@
 
 Name:           fedora-productimg-server
 Version:        21
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Installer branding and configuration for Fedora Server
 
 # Copyright and related rights waived via CC0
@@ -42,10 +42,12 @@ ln -sf %{pixmapsource}/sidebar-logo.png %{buildroot}%{pixmaptarget}/sidebar-logo
 
 install -m 755 -d %{buildroot}%{_datadir}/fedora-productimg
 
-find %{buildroot}%{pixmaptarget} -depth -printf '%P\0' | \
+pushd %{buildroot}%{_datadir}/lorax/product/
+find %{buildroot}%{_datadir}/lorax/product/ -depth -printf '%%P\0' | \
    cpio --null --quiet -H newc -o | \
    xz -9 > \
    %{buildroot}%{_datadir}/fedora-productimg/product.img
+popd
 
 
 %files
@@ -59,6 +61,9 @@ find %{buildroot}%{pixmaptarget} -depth -printf '%P\0' | \
 %{_datadir}/fedora-productimg/product.img
 
 %changelog
+* Wed Nov 26 2014 Matthew Miller <mattdm at fedoraproject.org> 21-7
+- correctly pregenerate product.img cpio archive
+
 * Thu Nov 20 2014 Matthew Miller <mattdm at fedoraproject.org> 21-6
 - provide lorax-product-server
 


More information about the scm-commits mailing list