diff mbox series

[meta-xfce,kirkstone] xfce4-panel-profiles:fix tar error

Message ID 20240710065313.3176904-1-haixiao.yan.cn@windriver.com
State New
Headers show
Series [meta-xfce,kirkstone] xfce4-panel-profiles:fix tar error | expand

Commit Message

Haixiao.Yan July 10, 2024, 6:53 a.m. UTC 
From: Kai Kang <kai.kang@windriver.com>

Backport patch to fix tar errors:

  tar: value 1762430260 out of uid_t range 0..2097151

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
---
 ...Makefile.in.in-Pass-arguments-to-tar.patch | 30 +++++++++++++++++++
 .../xfce4-panel-profiles_1.0.13.bb            |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-Pass-arguments-to-tar.patch
diff mbox series

Patch

diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-Pass-arguments-to-tar.patch b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-Pass-arguments-to-tar.patch
new file mode 100644
index 000000000..6e1718737
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-Pass-arguments-to-tar.patch
@@ -0,0 +1,30 @@ 
+Upstream-Status: Backport [https://gitlab.xfce.org/apps/xfce4-panel-profiles/-/commit/1b853cf]
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+From 1b853cf45b63c67ef52fc1288afb19b18542bb21 Mon Sep 17 00:00:00 2001
+From: Akbarkhon Variskhanov <akbarkhon.variskhanov@gmail.com>
+Date: Thu, 3 Nov 2022 10:29:52 +0500
+Subject: [PATCH] Makefile.in.in: Pass arguments to tar to make build
+ reproducible regardless of user or umask
+
+---
+ Makefile.in.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile.in.in b/Makefile.in.in
+index 84b12cb..cdb05c6 100644
+--- a/Makefile.in.in
++++ b/Makefile.in.in
+@@ -31,6 +31,8 @@ pot:
+ 
+ ifeq ($(shell tar --help|grep -o sort=),sort=)
+   TAROPTS := --sort=name --format ustar
++  TAROPTS += --owner=0 --group=0 --numeric-owner
++  TAROPTS += --mode=u=wrX,og=
+ endif
+ layouts:
+ 	cd data/layouts/cupertino; tar $(TAROPTS) -cvjf "../Cupertino.tar.bz2" *
+-- 
+GitLab
+
diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
index ab1b82726..f4681f460 100644
--- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
+++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
@@ -11,6 +11,7 @@  DEPENDS += "intltool-native"
 
 SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2 \
            file://not-create-link-to-locale.patch \
+           file://0001-Makefile.in.in-Pass-arguments-to-tar.patch \
            "
 SRC_URI[sha256sum] = "bc387c13f94109422dc72b0fcb919b0dc11619ba589d03e492252b0d2513b170"