Merge related patch for zstd function

https://github.com/openSUSE/obs-build/commit/e920b8708e0fe52f08c5619f872d6f8358f68ad2
https://github.com/openSUSE/obs-build/commit/c87192215fab9474cb910638b54396a5d38c0fdd
https://github.com/openSUSE/obs-build/commit/18a35a8096fffa1f41e29e540d7de47ecd999ec0

Change-Id: I5c7bd8bd378377504b43d4468f36d92430384284
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/Build/Deb.pm b/Build/Deb.pm
index 3d72088e74b15f633a9bd362d33b814236bafc29..dc708a955a8f6446da71c40709f77dd64695d181 100644 (file)
--- a/Build/Deb.pm
+++ b/Build/Deb.pm
@@ -263,6 +263,8 @@ sub debq {
     $decompressor = 'gunzip';
   } elsif ($controlname eq 'control.tar.xz  ' || $controlname eq 'control.tar.xz/ ') {
     $decompressor = 'unxz';
+  } elsif ($controlname eq 'control.tar.zst ' || $controlname eq 'control.tar.zst/') {
+    $decompressor = 'unzstd';
   } elsif ($controlname eq 'control.tar     ' || $controlname eq 'control.tar/    ') {
     $decompressor = 'cat';
   } else {
@@ -398,6 +400,7 @@ sub queryhdrmd5 {
   my $controlname = substr($data, 0, 16);
   if ($controlname ne 'control.tar.gz  ' && $controlname ne 'control.tar.gz/ ' &&
       $controlname ne 'control.tar.xz  ' && $controlname ne 'control.tar.xz/ ' &&
+      $controlname ne 'control.tar.zst ' && $controlname ne 'control.tar.zst/' &&
       $controlname ne 'control.tar     ' && $controlname ne 'control.tar/    ') {
     warn("$bin: control.tar is not second ar entry\n");
     close F;

diff --git a/build-pkg-deb b/build-pkg-deb
index bb937a92893a1879c30ae23e812942c902b6a7ea..832bb7a655ae4dc1d3909f72fda7966da4303985 100644 (file)
--- a/build-pkg-deb
+++ b/build-pkg-deb
@@ -130,20 +130,24 @@ pkg_preinstall_deb() {
     ar x "$BUILD_ROOT/.init_b_cache/rpms/$PKG.deb"
     mkdir -p .init_b_cache/scripts/control
     if test -f "control.tar.gz" ; then
-    $TAR -C .init_b_cache/scripts/control -z -f control.tar.gz
+       $TAR -C .init_b_cache/scripts/control -z -f control.tar.gz
     elif test -f "control.tar.xz" ; then
-    $TAR -C .init_b_cache/scripts/control -J -f control.tar.xz
+       $TAR -C .init_b_cache/scripts/control -J -f control.tar.xz
+    elif test -f "control.tar.zst" ; then
+       $TAR -C .init_b_cache/scripts/control -J -f control.tar.zst
     fi
     if test -f "data.tar.gz" ; then
        $TAR -z -f data.tar.gz
     elif test -f "data.tar.xz" ; then
        $TAR -J -f data.tar.xz
+    elif test -f "data.tar.zst" ; then
+        $TAR -J -f data.tar.zst
     fi
     if test -e ".init_b_cache/scripts/$PKG.run" ; then
        test -e .init_b_cache/scripts/control/preinst && mv .init_b_cache/scripts/control/preinst ".init_b_cache/scripts/$PKG.pre"
        test -e .init_b_cache/scripts/control/postinst && mv .init_b_cache/scripts/control/postinst ".init_b_cache/scripts/$PKG.post"
     fi
-    rm -rf .init_b_cache/scripts/control control.tar.{g,x}z data.tar.{g,x}z
+    rm -rf .init_b_cache/scripts/control control.tar.{g,x}z data.tar.{g,x}z control.tar.zst data.tar.zst
 }
 
 pkg_runscripts_deb() {