Skip to contentSkip to conversation

cpio: update 2.5 to 2.11

PATCH Superseded Scott Garman 2 participants 6 messages Oct 11, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpio: update 2.5 to 2.11

---
 recipes/cpio/cpio-2.11/statdef.patch |   15 ++++++++
 recipes/cpio/cpio_2.11.bb            |   42 +++++++++++++++++++++++
 recipes/cpio/cpio_2.5.bb             |   42 -----------------------
 recipes/cpio/files/install.patch     |   61 ----------------------------------
 4 files changed, 57 insertions(+), 103 deletions(-)
 create mode 100644 recipes/cpio/cpio-2.11/statdef.patch
 create mode 100644 recipes/cpio/cpio_2.11.bb
 delete mode 100644 recipes/cpio/cpio_2.5.bb
 delete mode 100644 recipes/cpio/files/install.patch
recipes/cpio/cpio-2.11/statdef.patch new file +15 -0
new file mode 100644
index 0000000..059976c
@@ -0,0 +1,15 @@
+# Avoid multiple stat definitions
+# Patch taken from cpio mailing list posting 2010-03-19
+#
+# Signed-off-by: Scott Garman <[email protected]>
+
+diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h
+--- cpio-2.11.orig/src/filetypes.h	2010-02-12 02:19:23.000000000 -0800
++++ cpio-2.11/src/filetypes.h	2010-07-23 13:17:25.000000000 -0700
+@@ -82,4 +82,6 @@
+ #define lstat stat
+ #endif
+ int lstat ();
++#ifndef stat
+ int stat ();
++#endif
recipes/cpio/cpio_2.11.bb new file +42 -0

42 lines not on this page · raw message

recipes/cpio/cpio_2.5.bb deleted +0 -42

42 lines not on this page · raw message

recipes/cpio/files/install.patch deleted +0 -61

61 lines not on this page · raw message

Signature · 1 line
1.6.3.3
#1 lore raw
Quoted 11 lines · Scott Garman
---
  recipes/cpio/cpio-2.11/statdef.patch |   15 ++++++++
  recipes/cpio/cpio_2.11.bb            |   42 +++++++++++++++++++++++
  recipes/cpio/cpio_2.5.bb             |   42 -----------------------
  recipes/cpio/files/install.patch     |   61 ----------------------------------
  4 files changed, 57 insertions(+), 103 deletions(-)

create mode 100644 recipes/cpio/cpio-2.11/statdef.patch create mode 100644 recipes/cpio/cpio_2.11.bb delete mode 100644 recipes/cpio/cpio_2.5.bb delete mode 100644 recipes/cpio/files/install.patch

I'd like to point out that I used git mv to rename cpio_2.5.bb to cpio_2.11.bb, but git format-patch refuses to show the rename. I tried passing it the -M flag and also setting diff.renames to true in my .gitconfig file. So I'm not sure what's causing the problem.

Scott

Signature · 2 lines
Scott Garman
sgarman at zenlinux dot com
#2 lore raw

OT: git format-patch -M (was: [PATCH] cpio: update 2.5 to 2.11)

Am Sonntag, den 10.10.2010, 22:54 -0700 schrieb Scott Garman:

Quoted 13 lines · Scott Garman
Quoted 11 lines
---
  recipes/cpio/cpio-2.11/statdef.patch |   15 ++++++++
  recipes/cpio/cpio_2.11.bb            |   42 +++++++++++++++++++++++
  recipes/cpio/cpio_2.5.bb             |   42 -----------------------
  recipes/cpio/files/install.patch     |   61 ----------------------------------
  4 files changed, 57 insertions(+), 103 deletions(-)

create mode 100644 recipes/cpio/cpio-2.11/statdef.patch create mode 100644 recipes/cpio/cpio_2.11.bb delete mode 100644 recipes/cpio/cpio_2.5.bb delete mode 100644 recipes/cpio/files/install.patch

Quoted 4 lines

I'd like to point out that I used git mv to rename cpio_2.5.bb to cpio_2.11.bb, but git format-patch refuses to show the rename. I tried passing it the -M flag and also setting diff.renames to true in my .gitconfig file. So I'm not sure what's causing the problem.

Well my guess is, that it is due to the changed checksums, so that it is not only a rename.

Thanks,

Paul

#3 lore raw
In reply to Scott Garman

Am Sonntag, den 10.10.2010, 22:42 -0700 schrieb Scott Garman:

Quoted 1 line

I build tested your patch for minimal-eglibc for MACHINE = "beagleboard".

Quoted 17 lines
---
 recipes/cpio/cpio-2.11/statdef.patch |   15 ++++++++
 recipes/cpio/cpio_2.11.bb            |   42 +++++++++++++++++++++++
 recipes/cpio/cpio_2.5.bb             |   42 -----------------------
 recipes/cpio/files/install.patch     |   61 ----------------------------------
 4 files changed, 57 insertions(+), 103 deletions(-)
 create mode 100644 recipes/cpio/cpio-2.11/statdef.patch
 create mode 100644 recipes/cpio/cpio_2.11.bb
 delete mode 100644 recipes/cpio/cpio_2.5.bb
 delete mode 100644 recipes/cpio/files/install.patch
recipes/cpio/cpio-2.11/statdef.patch new file +0 -0
new file mode 100644
index 0000000..059976c

recipes/cpio/cpio-2.11/statdef.patch line 4

Quoted 4 lines
recipes/cpio/cpio-2.11/statdef.patch new file +4 -0
@@ -0,0 +1,15 @@
+# Avoid multiple stat definitions
+# Patch taken from cpio mailing list posting 2010-03-19
+#
+# Signed-off-by: Scott Garman <[email protected]>

Please include the link to that message in the archive.

[…]

Thanks,

Paul

#4 lore raw
Quoted 5 lines · Paul Menzel

Am Sonntag, den 10.10.2010, 22:42 -0700 schrieb Scott Garman:

Quoted 1 line

I build tested your patch for minimal-eglibc for MACHINE = "beagleboard".

Thanks!

Quoted 4 lines
Quoted 4 lines
recipes/cpio/cpio-2.11/statdef.patch new file +0 -1
new file mode 100644
index 0000000..059976c
--- /dev/null
Quoted 8 lines

recipes/cpio/cpio-2.11/statdef.patch line 4

Quoted 6 lines

+++ b/recipes/cpio/cpio-2.11/statdef.patch

recipes/cpio/cpio-2.11/statdef.patch new file +4 -0
@@ -0,0 +1,15 @@
+# Avoid multiple stat definitions
+# Patch taken from cpio mailing list posting 2010-03-19
+#
+# Signed-off-by: Scott Garman<[email protected]>

Please include the link to that message in the archive.

Will do, respin on its way shortly...

Scott

Signature · 2 lines
Scott Garman
sgarman at zenlinux dot com
#5 lore raw

PATCH v2 1/1 cpio: update 2.5 to 2.11

In reply to Scott Garman
---
 recipes/cpio/cpio-2.11/statdef.patch |   16 +++++++++
 recipes/cpio/cpio_2.11.bb            |   42 +++++++++++++++++++++++
 recipes/cpio/cpio_2.5.bb             |   42 -----------------------
 recipes/cpio/files/install.patch     |   61 ----------------------------------
 4 files changed, 58 insertions(+), 103 deletions(-)
 create mode 100644 recipes/cpio/cpio-2.11/statdef.patch
 create mode 100644 recipes/cpio/cpio_2.11.bb
 delete mode 100644 recipes/cpio/cpio_2.5.bb
 delete mode 100644 recipes/cpio/files/install.patch
recipes/cpio/cpio-2.11/statdef.patch new file +16 -0
new file mode 100644
index 0000000..c3117c9
@@ -0,0 +1,16 @@
+# Avoid multiple stat definitions
+# Patch written by Naohiro Aota, taken from cpio mailing list:
+# http://lists.gnu.org/archive/html/bug-cpio/2010-03/msg00005.html
+#
+# Signed-off-by: Scott Garman <[email protected]>
+
+diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h
+--- cpio-2.11.orig/src/filetypes.h	2010-02-12 02:19:23.000000000 -0800
++++ cpio-2.11/src/filetypes.h	2010-07-23 13:17:25.000000000 -0700
+@@ -82,4 +82,6 @@
+ #define lstat stat
+ #endif
+ int lstat ();
++#ifndef stat
+ int stat ();
++#endif
recipes/cpio/cpio_2.11.bb new file +42 -0

42 lines not on this page · raw message

recipes/cpio/cpio_2.5.bb deleted +0 -42

42 lines not on this page · raw message

recipes/cpio/files/install.patch deleted +0 -61

61 lines not on this page · raw message

Signature · 1 line
1.6.3.3