tools/app-arch/cpio/akaros-patches/2.12/cpio-2.12.patch

diff -ru cpio-2.12.dist/build-aux/config.guess cpio-2.12/build-aux/config.guess
--- cpio-2.12.dist/build-aux/config.guess	2015-08-31 15:42:53.000000000 -0400
+++ cpio-2.12/build-aux/config.guess	2016-05-25 15:37:40.237245284 -0400
@@ -229,6 +229,10 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}${abi}"
 	exit ;;
+    *:Akaros:*:*)
+	UNAME_MACHINE_ARCH=x86_64
+	echo x86_64-ucb-akaros1.0
+	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
diff -ru cpio-2.12.dist/build-aux/config.sub cpio-2.12/build-aux/config.sub
--- cpio-2.12.dist/build-aux/config.sub	2015-08-31 15:42:53.000000000 -0400
+++ cpio-2.12/build-aux/config.sub	2016-05-25 15:38:09.686046995 -0400
@@ -1379,7 +1379,7 @@
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
+	      | -akaros* | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff -ru cpio-2.12.dist/gnu/error.c cpio-2.12/gnu/error.c
--- cpio-2.12.dist/gnu/error.c	2015-08-31 15:58:43.000000000 -0400
+++ cpio-2.12/gnu/error.c	2016-08-16 14:33:12.109948212 -0400
@@ -170,7 +170,8 @@
 static void
 print_errno_message (int errnum)
 {
-  char const *s;
+  char const *s, *estr;
+  int serrno = errno;
 
 #if defined HAVE_STRERROR_R || _LIBC
   char errbuf[1024];
@@ -196,6 +197,11 @@
 #else
   fprintf (stderr, ": %s", s);
 #endif
+#ifdef __ros__
+  estr = errstr ();
+  if (serrno == errnum && estr != NULL && *estr != '\0') {
+    fprintf (stderr, ", %s", estr);
+#endif
 }
 
 static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
diff -ru cpio-2.12.dist/lib/sysdep.c cpio-2.12/lib/sysdep.c
--- cpio-2.12.dist/lib/sysdep.c	2014-11-29 10:38:16.000000000 -0500
+++ cpio-2.12/lib/sysdep.c	2016-05-25 15:40:00.341059521 -0400
@@ -29,6 +29,7 @@
 #include <errno.h>
 
 
+#ifndef __ros__
 
 
 #ifndef HAVE_GETPWUID
@@ -188,3 +189,4 @@
 }
 #endif
 
+#endif
diff -ru cpio-2.12.dist/lib/system.h cpio-2.12/lib/system.h
--- cpio-2.12.dist/lib/system.h	2015-08-31 15:43:05.000000000 -0400
+++ cpio-2.12/lib/system.h	2016-05-25 15:43:12.334286686 -0400
@@ -304,6 +304,13 @@
 # define GOT_MAJOR
 #endif
 
+#ifdef __ros__
+# define major(device)		(device)
+# define minor(device)		(device)
+# define makedev(major, minor)	(((major) << 8) | (minor))
+# define GOT_MAJOR
+#endif
+
 #ifndef GOT_MAJOR
 # if MSDOS
 #  define major(device)		(device)