diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/base-files/base-files/profile | 4 | ||||
| -rw-r--r-- | packages/cron/cron-3.0pl1/init | 38 | ||||
| -rwxr-xr-x | packages/cron/cron-3.0pl1/install-sh | 323 | ||||
| -rw-r--r-- | packages/cron/cron_3.0pl1.bb | 12 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.11.2/defconfig | 2 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c | 29 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel_2.4.22.l2.3r25.bb (renamed from packages/linux/unslung-kernel_2.3r25.bb) | 0 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel_2.4.22.l2.3r29.bb (renamed from packages/linux/unslung-kernel_2.3r29.bb) | 0 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 11 | ||||
| -rw-r--r-- | packages/mysql/mysql_4.1.12.bb | 5 | ||||
| -rw-r--r-- | packages/nis/ypserv_2.17.bb (renamed from packages/nis/ypserv_2.15.bb) | 0 | ||||
| -rw-r--r-- | packages/openvpn/openvpn_2.0.bb | 4 | ||||
| -rw-r--r-- | packages/samba/files/configure.lfs.patch | 12 | ||||
| -rw-r--r-- | packages/samba/files/init | 58 | ||||
| -rw-r--r-- | packages/samba/samba.inc | 2 | ||||
| -rw-r--r-- | packages/samba/samba_3.0.14a.bb | 46 |
16 files changed, 525 insertions, 21 deletions
diff --git a/packages/base-files/base-files/profile b/packages/base-files/base-files/profile index 3de4dfe607..f24fec92ca 100644 --- a/packages/base-files/base-files/profile +++ b/packages/base-files/base-files/profile @@ -2,6 +2,8 @@ # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). PATH="/usr/local/bin:/usr/bin:/bin" +EDITOR="/bin/vi" # needed for packages like cron +TERM="vt100" # Basic terminal capab. For screen etc. if [ "`id -u`" -eq 0 ]; then PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: @@ -18,7 +20,7 @@ if [ -d /etc/profile.d ]; then unset i fi -export PATH PS1 OPIEDIR QPEDIR QTDIR +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM umask 022 diff --git a/packages/cron/cron-3.0pl1/init b/packages/cron/cron-3.0pl1/init new file mode 100644 index 0000000000..0a4f3e256f --- /dev/null +++ b/packages/cron/cron-3.0pl1/init @@ -0,0 +1,38 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/cron and type +# > update-rc.d cron defaults 60 +# +cron=/usr/sbin/cron +test -x "$cron" || exit 0 + +case "$1" in + start) + echo -n "Starting Vixie-cron" + start-stop-daemon --start --quiet --exec $cron + echo "." + ;; + stop) + echo -n "Stopping Vixie-cron" + start-stop-daemon --stop --quiet --pidfile /var/run/cron.pid + echo "." + ;; + reload|force-reload) + start-stop-daemon --stop --quiet --signal 1 --exec $cron + ;; + restart) + echo -n "Stopping Vixie-cron" + start-stop-daemon --stop --quiet --pidfile /var/run/cron.pid + echo "." + sleep 1 + echo -n "Starting Vixie-cron" + start-stop-daemon --start --quiet --exec $cron + echo "." + ;; + *) + echo "Usage: /etc/init.d/cron {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0
\ No newline at end of file diff --git a/packages/cron/cron-3.0pl1/install-sh b/packages/cron/cron-3.0pl1/install-sh new file mode 100755 index 0000000000..0b65ee871d --- /dev/null +++ b/packages/cron/cron-3.0pl1/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2004-10-22.00 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit 0;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb index bca3f89180..4e13d4c2c1 100644 --- a/packages/cron/cron_3.0pl1.bb +++ b/packages/cron/cron_3.0pl1.bb @@ -1,15 +1,23 @@ SECTION = "base" DESCRIPTION = "Vixie cron." LICENSE = "cron" +PR="r3" SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \ file://nonrootinstall.patch;patch=1 \ - file://time.patch;patch=1" + file://time.patch;patch=1 \ + file://install-sh \ + file://init" S = "${WORKDIR}/cron${PV}" CFLAGS_append = " -I${S} -DSYS_TIME_H=0" do_install () { install -d ${D}${sbindir} ${D}${bindir} - oe_runmake 'DESTDIR=${D}' install + install -d ${D}${sysconfdir}/init.d/ + install -d ${D}/var/cron/tabs + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/cron + # This will make the -s option work somewhat portably cross + # platform + STRIPPROG="$STRIP" oe_runmake 'DESTDIR=${D}' INSTALL="${WORKDIR}/install-sh" install chmod ugo+rx ${D}${sbindir}/* ${D}${bindir}/* } diff --git a/packages/linux/openslug-kernel-2.6.11.2/defconfig b/packages/linux/openslug-kernel-2.6.11.2/defconfig index 15cac97e3e..c14c06c32c 100644 --- a/packages/linux/openslug-kernel-2.6.11.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.11.2/defconfig @@ -474,7 +474,7 @@ CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=m # CONFIG_ETHERTAP is not set # diff --git a/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c b/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c index 8e3ca894c4..d27b6732b0 100644 --- a/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c +++ b/packages/linux/openslug-kernel-2.6.11.2/nslu2-io.c @@ -65,9 +65,9 @@ #define VERSION "0.1.7" -#define N2RB_MAJOR 60 -#define N2PB_MAJOR 61 -#define N2BZ_MAJOR 62 +#define N2RB_MAJOR 60 //rbuttons +#define N2PB_MAJOR 61 //pbuttons +#define N2BZ_MAJOR 62 //buzzer #define N2LM_MAJOR 126 #define N2PB_IRQ 22 //gpio5 @@ -176,6 +176,9 @@ static struct timer_list n2rb_timer; static struct timer_list n2pb_timer; static struct timer_list n2bz_timer; //beeper +// sysfs class +static struct class_simple *n2lm_class; + //================================================================================================== // // Blinking is handled entirely by the 4 timer handlers. On timeout, the bit in the @@ -693,22 +696,36 @@ static int __init n2iom_init(void) printk(KERN_DEBUG "init_jiffy=%ld\n",init_jiffy); n2iom_initarch(); + n2lm_class = class_simple_create(THIS_MODULE, "nslu2"); + if (register_chrdev(N2RB_MAJOR, "n2_rbm", &n2pb_fops) < NOERR) { printk(KERN_DEBUG "Reset Button Major %d not available\n", N2RB_MAJOR); return -EBUSY; } + else { + class_simple_device_add(n2lm_class, MKDEV(N2RB_MAJOR, 0), NULL, "rbuttons"); + } if (register_chrdev(N2PB_MAJOR, "n2_pbm", &n2rb_fops) < NOERR) { printk(KERN_DEBUG "Power Button Major %d not available\n", N2PB_MAJOR); return -EBUSY; } + else { + class_simple_device_add(n2lm_class, MKDEV(N2PB_MAJOR, 0), NULL, "pbuttons"); + } if (register_chrdev(N2LM_MAJOR, "n2_ledm", &n2lm_fops) < NOERR) { printk(KERN_DEBUG "Led Manager Major %d not available\n", N2LM_MAJOR); return -EBUSY; } + else { + class_simple_device_add(n2lm_class, MKDEV(N2LM_MAJOR, 0), NULL, "leds"); + } if (register_chrdev(N2BZ_MAJOR, "n2_bzm", &n2bz_fops) < NOERR) { printk(KERN_DEBUG "Buzzer Major %d not available\n", N2BZ_MAJOR); return -EBUSY; } + else { + class_simple_device_add(n2lm_class, MKDEV(N2BZ_MAJOR, 0), NULL, "buzzer"); + } if (request_irq(N2RB_IRQ, &n2rb_handler, SA_INTERRUPT, "n2_rb", NULL) < NOERR) { printk(KERN_DEBUG "Reset Button IRQ %d not available\n", N2RB_IRQ); @@ -732,14 +749,20 @@ static void __exit n2iom_exit(void) del_timer(&n2rb_timer); free_irq(N2RB_IRQ,NULL); unregister_chrdev(N2PB_MAJOR, "n2pb"); + class_simple_device_remove(MKDEV(N2PB_MAJOR, 0)); del_timer(&n2pb_timer); free_irq(N2PB_IRQ, NULL); unregister_chrdev(N2RB_MAJOR, "n2rb" ); + class_simple_device_remove(MKDEV(N2RB_MAJOR, 0)); del_timer(&n2lm_rsg_timer); del_timer(&n2lm_rsr_timer); del_timer(&n2lm_d1_timer); del_timer(&n2lm_d2_timer); unregister_chrdev(N2LM_MAJOR, "n2lm" ); + class_simple_device_remove(MKDEV(N2LM_MAJOR, 0)); + unregister_chrdev(N2BZ_MAJOR, "n2bz"); + class_simple_device_remove(MKDEV(N2BZ_MAJOR, 0)); + class_simple_destroy(n2lm_class); } module_init (n2iom_init); diff --git a/packages/linux/unslung-kernel_2.3r25.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r25.bb index 99bf69abf8..99bf69abf8 100644 --- a/packages/linux/unslung-kernel_2.3r25.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r25.bb diff --git a/packages/linux/unslung-kernel_2.3r29.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb index 604dbd21ba..604dbd21ba 100644 --- a/packages/linux/unslung-kernel_2.3r29.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 81bb5a0d0c..ee5f080460 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -10,6 +10,7 @@ OPENSLUG_DEVELOPMENT = "\ autoconf \ automake \ bash \ + binutils \ bison \ bzip2 \ coreutils \ @@ -20,6 +21,7 @@ OPENSLUG_DEVELOPMENT = "\ gawk \ gcc \ gdb \ + gnu-config \ grep \ lsof \ m4 \ @@ -40,10 +42,10 @@ OPENSLUG_DEVELOPMENT_append_linux = "\ OPENSLUG_PACKAGES = "\ - atftp \ bash \ bluez-utils-nodbus bridge-utils \ - coreutils cvs\ + coreutils cron \ + cvs\ dnsmasq \ expat \ ftpd-topfield \ @@ -51,6 +53,7 @@ OPENSLUG_PACKAGES = "\ miau microcom mt-daapd mysql \ nail \ openssh \ + openvpn \ ppp puppy pwc \ rsync \ sudo sysfsutils \ @@ -61,7 +64,6 @@ OPENSLUG_PACKAGES = "\ reiserfsprogs reiser4progs \ python \ samba \ - strace \ wget \ unionfs-modules unionfs-utils \ " @@ -75,7 +77,8 @@ OPENSLUG_PACKAGES_append_linux = "\ nfs-utils \ " BROKEN_PACKAGES = "\ - cron \ + atftp \ + strace \ mgetty \ " diff --git a/packages/mysql/mysql_4.1.12.bb b/packages/mysql/mysql_4.1.12.bb index d5e7948458..a1173158ee 100644 --- a/packages/mysql/mysql_4.1.12.bb +++ b/packages/mysql/mysql_4.1.12.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The MySQL Open Source Database System" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SECTION = "libs" DEPENDS += "ncurses mysql-native" -PR = "r0" +PR = "r1" LICENSE = "GPL" SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -13,8 +13,9 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRN inherit autotools + EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'" -EXTRA_OECONF = " --with-embedded-server " +EXTRA_OECONF = " --with-embedded-server --prefix=/usr --datadir=/var/share --sysconfdir=/etc --localstatedir=/var/state --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " do_stage() { autotools_stage_includes diff --git a/packages/nis/ypserv_2.15.bb b/packages/nis/ypserv_2.17.bb index 6edb534e8f..6edb534e8f 100644 --- a/packages/nis/ypserv_2.15.bb +++ b/packages/nis/ypserv_2.17.bb diff --git a/packages/openvpn/openvpn_2.0.bb b/packages/openvpn/openvpn_2.0.bb index e67a99c9eb..5ea2e02d69 100644 --- a/packages/openvpn/openvpn_2.0.bb +++ b/packages/openvpn/openvpn_2.0.bb @@ -6,12 +6,14 @@ LICENSE = "GPLv2" PRIORITY = "optional" DEPENDS = "lzo openssl" RDEPENDS = "kernel-module-tun" -PR = "r0" +PR = "r1" SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ file://openvpn" S = "${WORKDIR}/openvpn-${PV}" +CFLAGS += "-fno-inline" + inherit autotools do_install_append() { diff --git a/packages/samba/files/configure.lfs.patch b/packages/samba/files/configure.lfs.patch new file mode 100644 index 0000000000..f0355ecd8d --- /dev/null +++ b/packages/samba/files/configure.lfs.patch @@ -0,0 +1,12 @@ +--- source/configure.in.virgin 2005-06-27 07:22:15.000000000 +0200 ++++ source/configure.in 2005-06-27 07:23:11.000000000 +0200 +@@ -628,7 +628,8 @@ + #endif + } + ], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross]) +- CPPFLAGS="$old_CPPFLAGS" ++# Ugly hack for cross compile. Just set the CPPFLAGS and go on. ++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $old_CPPFLAGS" + if test x$LINUX_LFS_SUPPORT = xyes ; then + CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" + AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support]) diff --git a/packages/samba/files/init b/packages/samba/files/init new file mode 100644 index 0000000000..cb57b17de4 --- /dev/null +++ b/packages/samba/files/init @@ -0,0 +1,58 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/samba and type +# > update-rc.d samba defaults 60 +# + + +smbd=/usr/sbin/smbd +test -x "$smbd" || exit 0 +nmbd=/usr/sbin/nmbd +test -x "$nmbd" || exit 0 + + +case "$1" in + start) + echo -n "Starting Samba: smbd" + start-stop-daemon --start --quiet --exec $smbd + echo -n " nmbd" + start-stop-daemon --start --quiet --exec $nmbd + echo "." + ;; + stop) + echo -n "Stopping Samba: smbd" + start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid + echo -n " nmbd" + start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid + echo "." + ;; + reload|force-reload) + start-stop-daemon --stop --quiet --signal 1 --exec $smbd + start-stop-daemon --stop --quiet --signal 1 --exec $nmbd + ;; + restart) + echo -n "Stopping Samba: smbd" + start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid + echo -n " nmbd" + start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid + echo "" + echo -n "Waiting for samba processes to die off" + for i in 1 2 3 ; + do + sleep 1 + echo -n "." + done + echo "" + echo -n "Starting Samba: smbd" + start-stop-daemon --start --quiet --exec $smbd + echo -n " nmbd" + start-stop-daemon --start --quiet --exec $nmbd + echo "." + ;; + *) + echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0
\ No newline at end of file diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index 9896495f1f..1f38f131e2 100644 --- a/packages/samba/samba.inc +++ b/packages/samba/samba.inc @@ -30,7 +30,7 @@ do_install_append() { ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so rm -f ${D}${bindir}/*.old rm -f ${D}${sbindir}/*.old - mv mount.cifs ${D}${bindir}/mount.cifs + install -c -m 755 mount.cifs ${D}${bindir}/mount.cifs } do_stage() { diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index 0f18f4b1d4..d58b939399 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,21 +1,55 @@ -PR = "r1" +PR = "r6" -SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/cifs.patch;patch=1" +# Ugly patch to hack configure.in to set the CPPFLAGS without actually checking for LFS support +# For nslu2. Will probably work for forcing for other archs as well. +LFS_SRC_URI = "" +LFS_SRC_URI_nslu2 = "file://configure.lfs.patch;patch=1" + +SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ + file://configure.patch;patch=1 \ + file://cifs.patch;patch=1 \ + ${LFS_SRC_URI} \ + file://init \ + " S := ${WORKDIR}/${P}/source include samba.inc -EXTRA_OECONF += "--with-mandir=${mandir}" +INITSCRIPT_NAME = "samba" +# No dependencies, goes in at level 20 (NOTE: take care with the +# level, later levels put the shutdown later too - see the links +# in rc6.d, the shutdown must precede network shutdown). +INITSCRIPT_PARAMS = "defaults" + +# The file system settings --foodir=dirfoo and overridden unconditionally +# in the samba config by --with-foodir=dirfoo - even if the --with is not +# specified! Fix that here. Set the privatedir to /etc/samba/private. +EXTRA_OECONF += "\ + --with-configdir=${sysconfdir}/samba \ + --with-privatedir=${sysconfdir}/samba/private \ + --with-lockdir=${localstatedir}/lock \ + --with-piddir=${localstatedir}/run \ + --with-logfilebase=${localstatedir}/log \ + --with-libdir=${libdir} \ + --with-mandir=${mandir} \ + --with-swatdir=${datadir}/swat \ + " do_install_append() { + install -d "${D}${localstatedir}/log" rm -f ${D}/sbin/mount.smbfs rmdir ${D}/sbin ln -sf smbmount ${D}${bindir}/mount.smbfs + install -d "${D}${sysconfdir}/init.d" + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba + install -d "${D}${sysconfdir}/samba" + install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf.default } PACKAGES =+ "swat" -FILES_swat = "${sbindir}/swat ${prefix}/swat ${libdir}/*.msg" +FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat" +# +# bug fix for samba.inc: +FILES_cifs-doc = "${mandir}/man8/mount.cifs.8" |