浏览代码

some vendor tar complain about setuid bits and other flags, but work fine

Ralf S. Engelschall 23 年之前
父节点
当前提交
00af1f558a
共有 1 个文件被更改,包括 12 次插入12 次删除
  1. 12 12
      openpkg/openpkg.spec

+ 12 - 12
openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20030109
-%define       R_openpkg 20030109
+%define       V_openpkg 20030110
+%define       R_openpkg 20030110
 
 #   the used software versions
 %define       V_rpm     4.0.2
@@ -281,7 +281,7 @@ Provides:     OpenPKG
     echo "l_build_ulim=\"$l_build_ulim\"; export l_build_ulim" >>.buildenv
 
     #   bootstrap GNU zip tool
-    ${l_tar} xf `SOURCE gzip-%{V_gzip}.tar` 2>/dev/null
+    ${l_tar} xf `SOURCE gzip-%{V_gzip}.tar` 2>/dev/null || true
     ( cd gzip-%{V_gzip}
       CC="${l_cc}" ./configure
       ${l_make}
@@ -290,15 +290,15 @@ Provides:     OpenPKG
     echo "l_gzip=\"$l_gzip\"; export l_gzip" >>.buildenv
 
     #   unpack distribution tarballs
-    ${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz`     | ${l_tar} xf -
-    ${l_gzip} -dc `SOURCE zlib-%{V_zlib}.tar.gz`   | ${l_tar} xf -
-    ${l_gzip} -dc `SOURCE bzip2-%{V_bzip2}.tar.gz` | ${l_tar} xf -
-    ${l_gzip} -dc `SOURCE db-%{V_db}.tar.gz`       | ${l_tar} xf -
-    ${l_gzip} -dc `SOURCE curl-%{V_curl}.tar.gz`   | ${l_tar} xf -
-    ${l_gzip} -dc `SOURCE make-%{V_make}.tar.gz`   | ${l_tar} xf -
-    ${l_gzip} -dc `SOURCE patch-%{V_patch}.tar.gz` | ${l_tar} xf -
-    ${l_gzip} -dc `SOURCE tar-%{V_tar}.tar.gz`     | ${l_tar} xf -
-    ${l_gzip} -dc `SOURCE bash-%{V_bash}.tar.gz`   | ${l_tar} xf -
+    ${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz`     | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE zlib-%{V_zlib}.tar.gz`   | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE bzip2-%{V_bzip2}.tar.gz` | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE db-%{V_db}.tar.gz`       | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE curl-%{V_curl}.tar.gz`   | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE make-%{V_make}.tar.gz`   | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE patch-%{V_patch}.tar.gz` | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE tar-%{V_tar}.tar.gz`     | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE bash-%{V_bash}.tar.gz`   | ${l_tar} xf - 2>/dev/null || true
 
     #   update config.guess/config.sub
     for dir in rpm-%{V_rpm} rpm-%{V_rpm}/popt db-%{V_db}/dist \