MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-05 05:04:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

pax: remove the recipe

Browse Source 
The situation with pax (vs. tar and cpio) is perfectly described here:
https://xkcd.com/927/

The only reason pax is still around, kind of, is because both POSIX and LSB
mandate it. Outside of those documents, it's not used by anyone.

Meanwhile, the upstream URI we've been taking it from went down, and rather
than seek an alternative source, I just went ahead and removed the recipe.

(From OE-Core rev: a62a7e11274c4965e122ed5bf01024cae8437af0)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2018-02-12 13:05:15 +02:00 committed by Richard Purdie
parent 0e469a5c4e
commit 1dd146d5ac
11 changed files with 1 additions and 1667 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.LSB
View File

@ -23,3 +23,4 @@ therefore provides compatibility with the following caveats:
* libpng 1.2 isn't provided; oe-core includes the latest release of libpng
instead.
* pax (POSIX standard archive) tool is not provided.

1
meta/conf/distro/include/maintainers.inc
View File

@ -565,7 +565,6 @@ RECIPE_MAINTAINER_pn-pango = "Maxin B. John <maxin.john@intel.com>"
RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-patch = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie <richard.purdie@linuxfoundation.org>"
RECIPE_MAINTAINER_pn-pax = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-pax-utils = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denys@ti.com>"
RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <Qi.Chen@windriver.com>"

1
meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
View File

@ -89,7 +89,6 @@ RDEPENDS_packagegroup-core-full-cmdline-utils = "\
mktemp \
ncurses \
net-tools \
pax \
popt \
procps \
psmisc \

1
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
View File

@ -158,7 +158,6 @@ RDEPENDS_packagegroup-core-lsb-core = "\
mktemp \
msmtp \
patch \
pax \
procps \
psmisc \
sed \

38
meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
View File

@ -1,38 +0,0 @@
From e67bb3debe582f0e77770b714bd012bb1082fc41 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 19 Apr 2017 11:32:00 -0700
Subject: [PATCH] Add a comment for fallthrough
Fixes warnings with gcc7 e.g.
../../../../../../../workspace/sources/pax/src/options.c: In function 'tar_options':
../../../../../../../workspace/sources/pax/src/options.c:725:7: error: this statement may fall through [-Werror=implicit-fallthrough=]
if (opt_add ("write_opt=nodir") < 0)
^
../../../../../../../workspace/sources/pax/src/options.c:730:2: note: here
case 'O':
^~~~
cc1: all warnings being treated as errors
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/options.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/options.c b/src/options.c
index c663b4e..b80819a 100644
--- a/src/options.c
+++ b/src/options.c
@@ -724,6 +724,7 @@ tar_options (int argc, char **argv)
case 'o':
if (opt_add ("write_opt=nodir") < 0)
tar_usage ();
+ /* fallthru */
case 'O':
Oflag = 1;
break;
--
2.12.2

1287
meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch
View File

File diff suppressed because it is too large Load Diff

65
meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
View File

@ -1,65 +0,0 @@
From 7f4f379f8343c0ce92aa30f3f9037288a089a902 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 18 Dec 2016 08:24:56 +0000
Subject: [PATCH] include <sys/sysmacros.h> for major/minor definitions
glibc 2.25 will error out if the applications are expecting
this to come from sys/types.h, it is being removed from
there.
Fixes
error: In the GNU C Library, "minor" is defined
| by <sys/sysmacros.h>. For historical compatibility, it is
| currently defined by <sys/types.h> as well, but we plan to
| remove this soon. To use "minor", include <sys/sysmacros.h>
| directly. If you did not intend to use a system-defined macro
| "minor", you should undefine it after including <sys/types.h>. [-Werror]
| ul_oct ((u_long) MINOR (arcn->sb.st_rdev), hd->devminor,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
src/cpio.c | 2 +-
src/gen_subs.c | 2 +-
src/tar.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: pax-3.4/src/cpio.c
===================================================================
--- pax-3.4.orig/src/cpio.c
+++ pax-3.4/src/cpio.c
@@ -36,6 +36,7 @@
#include "config.h"
#endif
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
Index: pax-3.4/src/gen_subs.c
===================================================================
--- pax-3.4.orig/src/gen_subs.c
+++ pax-3.4/src/gen_subs.c
@@ -37,6 +37,7 @@
#include "config.h"
#endif
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
Index: pax-3.4/src/tar.c
===================================================================
--- pax-3.4.orig/src/tar.c
+++ pax-3.4/src/tar.c
@@ -37,6 +37,7 @@
#include "config.h"
#endif
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>

33
meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch
View File

@ -1,33 +0,0 @@
From b1f50320332c9c90fa33ab136ef0ec2d12cda461 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 6 Jan 2016 12:30:52 -0800
Subject: [PATCH] use strtoll instead of strtoq
Use LLONG_MAX instead of LONG_LONG_MAX
LONG_LONG_MAX is GNU specific
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
src/options.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/options.c b/src/options.c
index da8b4cf..c663b4e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1547,8 +1547,8 @@ str_offt (char *val)
#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
|| (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- num = strtoq (val, &expr, 0);
- if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val))
+ num = strtoll (val, &expr, 0);
+ if ((num == LLONG_MAX) || (num <= 0) || (expr == val))
#else
num = strtol (val, &expr, 0);
if ((num == LONG_MAX) || (num <= 0) || (expr == val))
--
2.6.4

25
meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch
View File

@ -1,25 +0,0 @@
Upstream-Status: Pending
This patch fixes this compiler error with gcc 4.6.0
Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/08
| fts.c: In function 'pax_fts_set':
| fts.c:469:7: error: parameter 'sp' set but not used [-Werror=unused-but-set-parameter]
| cc1: all warnings being treated as errors
|
| make[2]: *** [fts.o] Error 1
Index: pax-3.4/lib/fts.c
===================================================================
--- pax-3.4.orig/lib/fts.c
+++ pax-3.4/lib/fts.c
@@ -466,7 +466,7 @@ name: t = sp->fts_path + NAPPEND(p->fts
/* ARGSUSED */
int
fts_set(sp, p, instr)
- FTS *sp;
+ FTS __attribute__((__unused__)) *sp;
FTSENT *p;
int instr;
{

185
meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
View File

@ -1,185 +0,0 @@
Upstream-Status: Pending
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Dec 6 10:34:53 2011 -0800
Fix pax-3.4 build for x32
off_t is 8byte for x32. We need to check both _FILE_OFFSET_BITS and
size of off_t to see if file offset is 64bit. This patch adds
AC_CHECK_SIZEOF(off_t) and checks SIZEOF_OFF_T == 8.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
Index: pax-3.4/configure.in
===================================================================
--- pax-3.4.orig/configure.in
+++ pax-3.4/configure.in
@@ -33,4 +33,7 @@ dnl Checks for header files.
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
+AC_CHECK_SIZEOF(off_t)
+AC_CHECK_SIZEOF(long)
+
AC_OUTPUT([Makefile lib/Makefile src/Makefile])
Index: pax-3.4/src/ar_io.c
===================================================================
--- pax-3.4.orig/src/ar_io.c
+++ pax-3.4/src/ar_io.c
@@ -378,7 +378,8 @@ ar_close(void)
* could have written anything yet.
*/
if (frmt == NULL) {
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
(void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n",
#else
(void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n",
@@ -391,7 +392,8 @@ ar_close(void)
if (strcmp(NM_CPIO, argv0) == 0)
(void)fprintf(listf,
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
"%qu blocks\n",
#else
"%lu blocks\n",
@@ -399,7 +401,8 @@ ar_close(void)
(rdcnt ? rdcnt : wrcnt) / 5120);
else if (strcmp(NM_TAR, argv0) != 0)
(void)fprintf(listf,
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
"%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n",
#else
"%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n",
Index: pax-3.4/src/cpio.c
===================================================================
--- pax-3.4.orig/src/cpio.c
+++ pax-3.4/src/cpio.c
@@ -218,7 +218,8 @@ rd_ln_nm (ARCHD *arcn)
*/
if ((arcn->sb.st_size == 0) ||
(arcn->sb.st_size >= (off_t) sizeof(arcn->ln_name))) {
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
paxwarn (1, "Cpio link name length is invalid: %qu",
arcn->sb.st_size);
#else
Index: pax-3.4/src/gen_subs.c
===================================================================
--- pax-3.4.orig/src/gen_subs.c
+++ pax-3.4/src/gen_subs.c
@@ -133,7 +133,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
* print device id's for devices, or sizes for other nodes
*/
if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK))
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
(void) fprintf (fp, "%4lu,%4lu ", (unsigned long) MAJOR (sbp->st_rdev),
(unsigned long) MINOR (sbp->st_rdev));
#else
@@ -142,7 +143,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
#endif
else
{
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
(void) fprintf (fp, "%9qu ", sbp->st_size);
#else
(void) fprintf (fp, "%9lu ", sbp->st_size);
@@ -334,7 +336,8 @@ ul_asc (u_long val, char *str, int len,
return (0);
}
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
/*
* asc_uqd()
* convert hex/octal character string into a u_quad_t. We do not have to
Index: pax-3.4/src/options.c
===================================================================
--- pax-3.4.orig/src/options.c
+++ pax-3.4/src/options.c
@@ -1545,7 +1545,8 @@ str_offt (char *val)
char *expr;
off_t num, t;
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
num = strtoq (val, &expr, 0);
if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val))
#else
Index: pax-3.4/src/tar.c
===================================================================
--- pax-3.4.orig/src/tar.c
+++ pax-3.4/src/tar.c
@@ -58,7 +58,8 @@
static unsigned long tar_chksm (char *, int);
static char *name_split (char *, int);
static int ul_oct (u_long, char *, int, int);
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
static int uqd_oct (u_quad_t, char *, int, int);
#endif
@@ -196,7 +197,8 @@ ul_oct (u_long val, register char *str,
return (0);
}
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
/*
* uqd_oct()
* convert an u_quad_t to an octal string. one of many oddball field
@@ -427,7 +429,8 @@ tar_rd (ARCHD *arcn, char *buf)
0xfff);
arcn->sb.st_uid = (uid_t) asc_ul (hd->uid, sizeof (hd->uid), OCT);
arcn->sb.st_gid = (gid_t) asc_ul (hd->gid, sizeof (hd->gid), OCT);
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
#else
arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
@@ -659,7 +662,8 @@ tar_wr (register ARCHD * arcn)
* data follows this file, so set the pad
*/
hd->linkflag = AREGTYPE;
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
sizeof (hd->size), 1))
#else
@@ -834,7 +838,8 @@ ustar_rd (ARCHD *arcn, char *buf)
*/
arcn->sb.st_mode = (mode_t) (asc_ul (hd->mode, sizeof (hd->mode), OCT) &
0xfff);
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
#else
arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
@@ -1081,7 +1086,8 @@ ustar_wr (register ARCHD * arcn)
else
hd->typeflag = REGTYPE;
arcn->pad = TAR_PAD (arcn->sb.st_size);
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
sizeof (hd->size), 3))
{

31
meta/recipes-extended/pax/pax_3.4.bb
View File

@ -1,31 +0,0 @@
SUMMARY = "Portable Archive eXchange"
DESCRIPTION = "pax (Portable Archive eXchange) is the POSIX standard archive tool"
HOMEPAGE = "http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
BUGTRACKER = "http://www.openbsd.org/query-pr.html"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \
file://src/pax.h;endline=40;md5=309d3e241c1d82069228e5a51e9b8d60 \
file://src/cpio.h;endline=40;md5=c3b4bbff6133a83387968617bbae8ac4 \
file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053"
SECTION = "base"
PR = "r2"
DEPENDS_append_libc-musl = " fts "
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \
file://fix_for_compile_with_gcc-4.6.0.patch \
file://pax-3.4_fix_for_x32.patch \
file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \
file://0001-Add-a-comment-for-fallthrough.patch \
"
SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \
file://0001-use-strtoll-instead-of-strtoq.patch \
"
SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6"
SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b"
inherit autotools