summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2018-02-15 16:37:23 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-02-18 02:24:31 +0100
commit0add6dbacbed852f2b5180e04571f039cbf9dd0b (patch)
treea2e91dc7773c909a0d8389dd4d5512f347f1dbe3 /sysui
parent2b266a338718ccd994a4cef05f128eb0c1b9fdc7 (diff)
tdf#115554: Fix ownership in desktop-integration tars
Use fakeroot to call tar when creating the tar.gz archives holding the desktop-integration parts to have root:root as owner of the files inside those. Change-Id: Idcdcb4dd398f330773671266dafb354711b0f093 Reviewed-on: https://gerrit.libreoffice.org/49827 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sysui')
-rw-r--r--sysui/CustomTarget_deb.mk2
-rw-r--r--sysui/CustomTarget_rpm.mk2
-rw-r--r--sysui/CustomTarget_solaris.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index dd75ee913c62..92cda34a3bfe 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -25,7 +25,7 @@ $(foreach product,$(PRODUCTLIST),\
))
$(deb_WORKDIR)/%-desktop-integration.tar.gz: $(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb
- $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@
+ fakeroot $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@
$(deb_WORKDIR)/%/DEBIAN/postrm: $(deb_SRCDIR)/postrm
cat $< | tr -d "\015" | \
diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index 8cc56ed80e34..a76b4161e2af 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -54,6 +54,6 @@ $(foreach product,$(PRODUCTLIST),\
))
$(rpm_WORKDIR)/%-desktop-integration.tar.gz:
- $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@
+ fakeroot $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@
# vim: set noet sw=4 ts=4:
diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk
index 20072fe0cd7f..42a0a8a90633 100644
--- a/sysui/CustomTarget_solaris.mk
+++ b/sysui/CustomTarget_solaris.mk
@@ -50,6 +50,6 @@ $(solaris_WORKDIR)/%/prototype: $(solaris_SRCDIR)/prototype
$(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/%/copyright $(solaris_WORKDIR)/%/pkginfo $(solaris_WORKDIR)/%/depend $(solaris_WORKDIR)/%/mailcap $(solaris_WORKDIR)/%/postinstall $(solaris_WORKDIR)/%/postremove $(solaris_WORKDIR)/%/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml
# pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*)
- $(GNUTAR) -cf - -C $(solaris_WORKDIR) $* | gzip > $@
+ fakeroot $(GNUTAR) -cf - -C $(solaris_WORKDIR) $* | gzip > $@
# vim: set noet sw=4 ts=4: