Unbork the cpio installation.

BKrev: 41b3e08fVjUbI-Iu074zLG4YdqgoWg

diff --git a/cpio/cpio_2.5.oe b/cpio/cpio_2.5.oe
index e69de29..1d73a63 100644 (file)
--- a/cpio/cpio_2.5.oe
+++ b/cpio/cpio_2.5.oe
@@ -0,0 +1,12 @@
+DESCRIPTION = "GNU cpio is a program to manage archives of files."
+HOMEPAGE = "http://www.gnu.org/software/cpio/"
+SECTION = "utils"
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PR = "r1"
+
+SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
+          file://install.patch;patch=1"
+S = "${WORKDIR}/cpio-${PV}"
+
+inherit autotools

diff --git a/cpio/files/install.patch b/cpio/files/install.patch
index eb36818..fa39efa 100644 (file)
--- a/cpio/files/install.patch
+++ b/cpio/files/install.patch
@@ -3,7 +3,7 @@
 # Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
---- cpio-2.5/Makefile.in~install
+--- cpio-2.5/Makefile.in~install.patch
 +++ cpio-2.5/Makefile.in
 @@ -70,6 +70,7 @@
  # Prefix for each installed man page, normally empty or `g'.
@@ -13,7 +13,7 @@
  
  # Where to install the cpio and mt executables.
  bindir = @bindir@
-@@ -123,11 +124,11 @@
+@@ -123,19 +124,19 @@
        $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
  
  install:: installdirs all $(srcdir)/cpio.1 $(srcdir)/mt.1
@@ -22,11 +22,39 @@
 -      -test ! -f rmt || $(INSTALL_PROGRAM) rmt $(libexecdir)/rmt
 -      -$(INSTALL_DATA) $(srcdir)/cpio.1 $(mandir)/$(manprefix)cpio.$(manext)
 -      -test ! -f mt || $(INSTALL_DATA) $(srcdir)/mt.1 $(mandir)/$(manprefix)mt.$(manext)
-+      $(INSTALL_PROGRAM) cpio $(DESTDIR)$(bindir)/$(binprefix)cpio
-+      test ! -f mt || $(INSTALL_PROGRAM) mt $(DESTDIR)$(bindir)/$(binprefix)mt
-+      -test ! -f rmt || $(INSTALL_PROGRAM) rmt $(DESTDIR)$(libexecdir)/rmt
-+      -$(INSTALL_DATA) $(srcdir)/cpio.1 $(DESTDIR)$(mandir)/$(manprefix)cpio.$(manext)
-+      -test ! -f mt || $(INSTALL_DATA) $(srcdir)/mt.1 $(DESTDIR)$(mandir)/$(manprefix)mt.$(manext)
++      $(INSTALL_PROGRAM) -D cpio $(DESTDIR)$(bindir)/$(binprefix)cpio
++      test ! -f mt || $(INSTALL_PROGRAM) -D mt $(DESTDIR)$(bindir)/$(binprefix)mt
++      -test ! -f rmt || $(INSTALL_PROGRAM) -D rmt $(DESTDIR)$(libexecdir)/rmt
++      -$(INSTALL_DATA) -D $(srcdir)/cpio.1 $(DESTDIR)$(mandir)/$(manprefix)cpio.$(manext)
++      -test ! -f mt || $(INSTALL_DATA) -D $(srcdir)/mt.1 $(DESTDIR)$(mandir)/$(manprefix)mt.$(manext)
  
  installdirs:
        $(srcdir)/mkinstalldirs $(bindir) $(libexecdir) $(mandir) $(infodir)
+ 
+ uninstall::
+-      cd $(bindir); rm -f $(binprefix)cpio $(binprefix)mt
+-      -rm -f $(libexecdir)/rmt
+-      cd $(mandir); rm -f $(manprefix)cpio.$(manext) $(manprefix)mt.$(manext)
++      cd $(DESTDIR)$(bindir); rm -f $(binprefix)cpio $(binprefix)mt
++      -rm -f $(DESTDIR)$(libexecdir)/rmt
++      cd $(DESTDIR)$(mandir); rm -f $(manprefix)cpio.$(manext) $(manprefix)mt.$(manext)
+ 
+ check:
+       @echo No tests are supplied.
+@@ -186,14 +187,14 @@
+ 
+ install-info: $(INFO_DEPS)
+       for file in *.info*; do \
+-        $(INSTALL_DATA) $$file $(infodir)/$$file; \
++        $(INSTALL_DATA) -D $$file $(DESTDIR)$(infodir)/$$file; \
+       done
+ 
+ uninstall:: uninstall-info
+ 
+ uninstall-info:
+       for file in *.info*; do \
+-        rm -f $(infodir)/$$file; \
++        rm -f $(DESTDIR)$(infodir)/$$file; \
+       done
+ 
+ clean: