diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/autofs | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/autofs')
-rw-r--r-- | recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch | 30 | ||||
-rw-r--r-- | recipes/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch | 11 | ||||
-rw-r--r-- | recipes/autofs/autofs-4.1.4/autofs-additional-distros.patch | 12 | ||||
-rw-r--r-- | recipes/autofs/autofs-4.1.4/cross.patch | 38 | ||||
-rw-r--r-- | recipes/autofs/autofs-4.1.4/install.patch | 71 | ||||
-rw-r--r-- | recipes/autofs/autofs-4.1.4/no-bash.patch | 18 | ||||
-rw-r--r-- | recipes/autofs/autofs_3.1.7.bb | 18 | ||||
-rw-r--r-- | recipes/autofs/autofs_4.0.0.bb | 17 | ||||
-rw-r--r-- | recipes/autofs/autofs_4.1.4.bb | 34 |
9 files changed, 249 insertions, 0 deletions
diff --git a/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch b/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch new file mode 100644 index 0000000000..d8b3692efa --- /dev/null +++ b/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch @@ -0,0 +1,30 @@ +--- autofs-4.1.4/Makefile.rules.orig 2006-04-06 16:47:33.000000000 -0500 ++++ autofs-4.1.4/Makefile.rules 2006-04-06 16:49:16.000000000 -0500 +@@ -18,19 +18,19 @@ + # The STRIP defined here *must not* remove any dynamic-loading symbols + + ifdef DEBUG +-CFLAGS = -O2 -g -DDEBUG +-LDFLAGS = -g ++CFLAGS += -O2 -g -DDEBUG ++LDFLAGS += -g + STRIP = : + else +-CFLAGS = -O3 -fomit-frame-pointer -Wall +-LDFLAGS = -s +-STRIP = strip --strip-debug ++CFLAGS += -O3 -fomit-frame-pointer -Wall ++LDFLAGS += -s ++STRIP = ${TARGET_PREFIX}strip --strip-debug + endif + +-CC = gcc +-CXX = g++ ++CC ?= ${TARGET_PREFIX}gcc ++CXX ?= ${TARGET_PREFIX}g++ + CXXFLAGS = $(CFLAGS) +-LD = ld ++LD ?= ${TARGET_PREFIX}ld + SOLDFLAGS = -shared -Xlinker -rpath -Xlinker $(autofslibdir) + + # Standard rules diff --git a/recipes/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch b/recipes/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch new file mode 100644 index 0000000000..680e6ce4fc --- /dev/null +++ b/recipes/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch @@ -0,0 +1,11 @@ +--- autofs-4.1.4/samples/auto.net~ 2005-04-05 08:02:09.000000000 -0500 ++++ autofs-4.1.4/samples/auto.net 2007-04-07 14:41:19.000000000 -0500 +@@ -37,7 +37,7 @@ + # Newer distributions get this right + SHOWMOUNT="$SMNT --no-headers -e $key" + +-$SHOWMOUNT | LC_ALL=C sort +0 | \ ++$SHOWMOUNT | LC_ALL=C sort | \ + awk -v key="$key" -v opts="$opts" -- ' + BEGIN { ORS=""; first=1 } + { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } diff --git a/recipes/autofs/autofs-4.1.4/autofs-additional-distros.patch b/recipes/autofs/autofs-4.1.4/autofs-additional-distros.patch new file mode 100644 index 0000000000..2b1af584b3 --- /dev/null +++ b/recipes/autofs/autofs-4.1.4/autofs-additional-distros.patch @@ -0,0 +1,12 @@ +--- autofs-4.1.4/samples/rc.autofs.in~ 2005-04-11 06:30:54.000000000 -0500 ++++ autofs-4.1.4/samples/rc.autofs.in 2007-04-07 13:18:44.000000000 -0500 +@@ -43,6 +43,9 @@ + system=debian + elif [ -f /etc/redhat-release ]; then + system=redhat ++elif [ -f /etc/issue ] && grep -q "^SlugOS" /etc/issue ; then ++ # SlugOS behaves like Debian, at least for autofs purposes. ++ system=debian + else + echo "$0: Unknown system, please port and contact autofs@linux.kernel.org" 1>&2 + exit 1 diff --git a/recipes/autofs/autofs-4.1.4/cross.patch b/recipes/autofs/autofs-4.1.4/cross.patch new file mode 100644 index 0000000000..015c3dc4f2 --- /dev/null +++ b/recipes/autofs/autofs-4.1.4/cross.patch @@ -0,0 +1,38 @@ +--- autofs-4.1.4/aclocal.m4.original 2005-05-20 11:41:34 +0200 ++++ autofs-4.1.4/aclocal.m4 2005-05-20 11:41:47 +0200 +@@ -9,6 +9,8 @@ + AC_DEFUN(AF_PATH_INCLUDE, + [AC_PATH_PROGS($1,$2,$3,$4) + if test -n "$$1"; then ++ AH_TEMPLATE([HAVE_$1], [Have $2]) ++ AH_TEMPLATE([PATH_$1], [Have $2]) + AC_DEFINE(HAVE_$1) + AC_DEFINE_UNQUOTED(PATH_$1, "$$1") + HAVE_$1=1 +--- autofs-4.1.4/configure.in.original 2005-04-06 17:24:37 +0200 ++++ autofs-4.1.4/configure.in 2005-05-20 11:40:46 +0200 +@@ -134,12 +134,14 @@ + cat > pietest.c <<EOF + int main(void) { return 0; } + EOF ++AF_tmp_ldflags="$LDFLAGS" ++AF_tmp_cflags="$CFLAGS" + CFLAGS=-fPIE + LDFLAGS=-pie + DAEMON_CFLAGS= + DAEMON_LDFLAGS= + AC_MSG_CHECKING([whether gcc -fPIE works]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], + [gcc_supports_pie=yes], [gcc_supports_pie=no]) + AC_MSG_RESULT([$gcc_supports_pie]) + if test $gcc_supports_pie = yes ; then +@@ -149,6 +151,8 @@ + rm -f pietest.c + AC_SUBST(DAEMON_CFLAGS) + AC_SUBST(DAEMON_LDFLAGS) ++CFLAGS="${AF_tmp_cflags}" ++LDFLAGS="${AF_tmp_ldflags}" + + # + # Location of init.d directory? diff --git a/recipes/autofs/autofs-4.1.4/install.patch b/recipes/autofs/autofs-4.1.4/install.patch new file mode 100644 index 0000000000..ef13fd88c0 --- /dev/null +++ b/recipes/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/recipes/autofs/autofs-4.1.4/no-bash.patch b/recipes/autofs/autofs-4.1.4/no-bash.patch new file mode 100644 index 0000000000..16e83a0371 --- /dev/null +++ b/recipes/autofs/autofs-4.1.4/no-bash.patch @@ -0,0 +1,18 @@ +diff -Naur autofs-4.1.4/samples.orig/auto.net autofs-4.1.4/samples/auto.net +--- autofs-4.1.4/samples.orig/auto.net 2007-11-21 11:29:57.000000000 -0600 ++++ autofs-4.1.4/samples/auto.net 2007-11-21 11:30:27.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # $Id: auto.net,v 1.8 2005/04/05 13:02:09 raven Exp $ + +diff -Naur autofs-4.1.4/samples.orig/auto.smb autofs-4.1.4/samples/auto.smb +--- autofs-4.1.4/samples.orig/auto.smb 2007-11-21 11:29:57.000000000 -0600 ++++ autofs-4.1.4/samples/auto.smb 2007-11-21 11:30:34.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # $Id: auto.smb,v 1.3 2005/04/05 13:02:09 raven Exp $ + diff --git a/recipes/autofs/autofs_3.1.7.bb b/recipes/autofs/autofs_3.1.7.bb new file mode 100644 index 0000000000..05481ed46c --- /dev/null +++ b/recipes/autofs/autofs_3.1.7.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Kernel based automounter for linux." +SECTION = "base" +LICENSE = "GPL" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2" + +inherit autotools + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_install () { + install -d ${D}${mandir}/man5 ${D}${mandir}/man8 \ + ${D}${sbindir} + oe_runmake 'INSTALLROOT=${D}' install +} diff --git a/recipes/autofs/autofs_4.0.0.bb b/recipes/autofs/autofs_4.0.0.bb new file mode 100644 index 0000000000..6033b8a09a --- /dev/null +++ b/recipes/autofs/autofs_4.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Kernel based automounter for linux." +SECTION = "base" +LICENSE = "GPL" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/old/autofs-${PV}-1.tar.bz2" + +inherit autotools + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_install () { + oe_runmake 'INSTALLROOT=${D}' install +} diff --git a/recipes/autofs/autofs_4.1.4.bb b/recipes/autofs/autofs_4.1.4.bb new file mode 100644 index 0000000000..d9863ad9dd --- /dev/null +++ b/recipes/autofs/autofs_4.1.4.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Kernel based automounter for linux." +SECTION = "base" +LICENSE = "GPL" + +PR = "r2" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;patch=1 \ + ${KERNELORG_MIRROR}/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://install.patch;patch=1 \ + file://auto.net-sort-option-fix.patch;patch=1 \ + file://autofs-additional-distros.patch;patch=1 \ + file://no-bash.patch;patch=1" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "autofs" +INITSCRIPT_PARAMS = "defaults" + +EXTRA_OEMAKE="TARGET_PREFIX=${TARGET_PREFIX}" +PARALLEL_MAKE = "" + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_install () { + oe_runmake 'INSTALLROOT=${D}' install +} |