-
Notifications
You must be signed in to change notification settings - Fork 688
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cockpit: fix metainfo.xml file ownership
The 'tar -cf - | tar -xf' combo applies an invalid ownership. This is corrected by patching the install target to use the --no-same-owner tar parameter. Signed-off-by: Emmanuel Roullit <emmanuel.roullit@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
- Loading branch information
Showing
2 changed files
with
31 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
...r/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
From e56f2b294ca8c805bfd3d715d523bef188c54cb1 Mon Sep 17 00:00:00 2001 | ||
From: Emmanuel Roullit <emmanuel.roullit@gmail.com> | ||
Date: Sat, 2 May 2020 14:05:35 +0200 | ||
Subject: [PATCH] install: fix metainfo.xml ownership on install | ||
|
||
Signed-off-by: Emmanuel Roullit <emmanuel.roullit@gmail.com> | ||
--- | ||
Makefile.am | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/Makefile.am b/Makefile.am | ||
index d9f918e99..9a23e0a7b 100644 | ||
--- a/Makefile.am | ||
+++ b/Makefile.am | ||
@@ -226,10 +226,10 @@ maintainer-clean-local:: | ||
|
||
install-data-local:: $(WEBPACK_INSTALL) | ||
$(MKDIR_P) $(DESTDIR)$(pkgdatadir) | ||
- tar -cf - $^ | tar -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf - | ||
+ tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf - | ||
install-data-local:: $(WEBPACK_DEBUG) | ||
$(MKDIR_P) $(DESTDIR)$(debugdir)$(pkgdatadir) | ||
- tar -cf - $^ | tar -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf - | ||
+ tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf - | ||
uninstall-local:: | ||
find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type f -exec rm -f {} \; | ||
find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type d -empty -delete | ||
-- | ||
2.17.1 | ||
|