diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-06-19 13:14:19 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-19 13:14:19 +0000 |
| commit | 85658bb0515e09d568443a6b2abcd73b86c39313 (patch) | |
| tree | 5e747b205b95d9167b738773b586f4cf9b9e3a8d | |
| parent | 8554c283a5827810cbd74335bc836618373ce58a (diff) | |
autofs: added patch to get do_install working
| -rw-r--r-- | packages/autofs/autofs-4.1.4/install.patch | 71 | ||||
| -rw-r--r-- | packages/autofs/autofs_4.1.4.bb | 5 |
2 files changed, 74 insertions, 2 deletions
diff --git a/packages/autofs/autofs-4.1.4/install.patch b/packages/autofs/autofs-4.1.4/install.patch new file mode 100644 index 0000000000..ef13fd88c0 --- /dev/null +++ b/packages/autofs/autofs-4.1.4/install.patch @@ -0,0 +1,71 @@ +Index: autofs-4.1.4/man/Makefile +=================================================================== +--- autofs-4.1.4.orig/man/Makefile 2003-09-29 10:22:35.000000000 +0200 ++++ autofs-4.1.4/man/Makefile 2006-06-19 15:09:33.124583912 +0200 +@@ -14,9 +14,9 @@ + + install: all + install -d -m 755 $(INSTALLROOT)$(mandir)/man5 +- install -c *.5 -m 644 $(INSTALLROOT)$(mandir)/man5 ++ install -c -m 644 *.5 $(INSTALLROOT)$(mandir)/man5 + install -d -m 755 $(INSTALLROOT)$(mandir)/man8 +- install -c *.8 -m 644 $(INSTALLROOT)$(mandir)/man8 ++ install -c -m 644 *.8 $(INSTALLROOT)$(mandir)/man8 + + clean: + rm -f $(GENFILES) +Index: autofs-4.1.4/modules/Makefile +=================================================================== +--- autofs-4.1.4.orig/modules/Makefile 2004-08-29 14:46:23.000000000 +0200 ++++ autofs-4.1.4/modules/Makefile 2006-06-19 15:09:33.125583760 +0200 +@@ -53,7 +53,7 @@ + # mount_smbfs.so is an obsolete module which must be removed + install: all + install -d -m 755 $(INSTALLROOT)$(autofslibdir) +- install -c $(MODS) -m 755 $(INSTALLROOT)$(autofslibdir) ++ install -c -m 755 $(MODS) $(INSTALLROOT)$(autofslibdir) + -rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so + ifeq ($(EXT2FS), 1) + ifeq ($(EXT3FS), 1) +Index: autofs-4.1.4/samples/Makefile +=================================================================== +--- autofs-4.1.4.orig/samples/Makefile 2005-01-04 15:36:54.000000000 +0100 ++++ autofs-4.1.4/samples/Makefile 2006-06-19 15:09:33.125583760 +0200 +@@ -27,19 +27,19 @@ + install: all + install -d -m 755 $(INSTALLROOT)/etc + -mv -f $(INSTALLROOT)/etc/auto.master $(INSTALLROOT)/etc/auto.master.old +- install -c auto.master -m 644 $(INSTALLROOT)/etc ++ install -c -m 644 auto.master $(INSTALLROOT)/etc + -mv -f $(INSTALLROOT)/etc/auto.misc $(INSTALLROOT)/etc/auto.misc.old +- install -c auto.misc -m 644 $(INSTALLROOT)/etc ++ install -c -m 644 auto.misc $(INSTALLROOT)/etc + -mv -f $(INSTALLROOT)/etc/auto.net $(INSTALLROOT)/etc/auto.net.old +- install -c auto.net -m 755 $(INSTALLROOT)/etc ++ install -c -m 755 auto.net $(INSTALLROOT)/etc + -mv -f $(INSTALLROOT)/etc/auto.smb $(INSTALLROOT)/etc/auto.smb.old +- install -c auto.smb -m 755 $(INSTALLROOT)/etc ++ install -c -m 755 auto.smb $(INSTALLROOT)/etc + install -d -m 755 $(INSTALLROOT)$(initdir) +- install -c rc.autofs -m 755 $(INSTALLROOT)$(initdir)/autofs ++ install -c -m 755 rc.autofs $(INSTALLROOT)$(initdir)/autofs + install -d -m 755 $(INSTALLROOT)$(autofslibdir) + install -d -m 755 $(INSTALLROOT)/var/run/autofs + ifeq ($(LDAP), 1) +- install -c autofs-ldap-auto-master -m 755 $(INSTALLROOT)$(autofslibdir) ++ install -c -m 755 autofs-ldap-auto-master $(INSTALLROOT)$(autofslibdir) + endif + + clean): +Index: autofs-4.1.4/daemon/Makefile +=================================================================== +--- autofs-4.1.4.orig/daemon/Makefile 2006-06-19 15:10:47.526273136 +0200 ++++ autofs-4.1.4/daemon/Makefile 2006-06-19 15:10:58.661580312 +0200 +@@ -26,6 +26,6 @@ + + install: all + install -d -m 755 $(INSTALLROOT)$(sbindir) +- install -c automount -m 755 $(INSTALLROOT)$(sbindir) ++ install -c -m 755 automount $(INSTALLROOT)$(sbindir) + + diff --git a/packages/autofs/autofs_4.1.4.bb b/packages/autofs/autofs_4.1.4.bb index 7d40bee8d5..35a1652557 100644 --- a/packages/autofs/autofs_4.1.4.bb +++ b/packages/autofs/autofs_4.1.4.bb @@ -7,8 +7,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;patch=1 \ ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;patch=1 \ file://cross.patch;patch=1 \ - file://Makefile.rules-cross.patch;patch=1" - + file://Makefile.rules-cross.patch;patch=1 \ + file://install.patch;patch=1" + inherit autotools EXTRA_OEMAKE="TARGET_PREFIX=${TARGET_PREFIX}" |