From b3bc53b18619a0e0ad3df809bb3a16c127979d40 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 13 Jul 2005 07:37:09 +0000 Subject: Move various packages which only compile with glibc to the 'linux only' list. --- packages/meta/openslug-packages.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index f09318ba13..467c9ff20e 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -58,7 +58,6 @@ OPENSLUG_PACKAGES = "\ less \ libusb \ libxml2 \ - mgetty \ miau \ microcom \ mt-daapd \ @@ -68,7 +67,6 @@ OPENSLUG_PACKAGES = "\ openssh \ openvpn \ pcre \ - postfix \ ppp \ puppy \ pwc \ @@ -87,18 +85,21 @@ OPENSLUG_PACKAGES = "\ vlan \ wget \ unionfs-modules unionfs-utils \ - xinetd \ " # These packages only build on TARGET_OS=linux, not # TARGET_OS=linux-uclibc OPENSLUG_PACKAGES_append_linux = "\ bind \ - php \ + mgetty \ + nfs-utils \ libpam \ + php \ + postfix \ + xinetd \ yp-tools ypbind ypserv \ - nfs-utils \ " + BROKEN_PACKAGES = "\ atftp \ strace \ -- cgit v1.2.3 From 25979309f8be6cd0a7120e298e5e5344660fe46b Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 13 Jul 2005 07:41:16 +0000 Subject: Add install-native package and remove the install-sh from those packages which used it to get round the install -s problem - now simply add install-native to the DEPENDS for packages which attempt to use the host install with '-s' --- packages/cron/cron-3.0pl1/install-sh | 323 --------------------- packages/cron/cron_3.0pl1.bb | 8 +- packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh | 323 --------------------- packages/cyrus-imapd/cyrus-imapd_2.2.12.bb | 10 +- packages/install/.mtn2git_empty | 0 packages/install/files/.mtn2git_empty | 0 packages/install/files/install-sh | 323 +++++++++++++++++++++ packages/install/install-native_0.1.bb | 25 ++ packages/mgetty/mgetty_1.1.30.bb | 5 + 9 files changed, 358 insertions(+), 659 deletions(-) delete mode 100755 packages/cron/cron-3.0pl1/install-sh delete mode 100644 packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh create mode 100644 packages/install/.mtn2git_empty create mode 100644 packages/install/files/.mtn2git_empty create mode 100644 packages/install/files/install-sh create mode 100644 packages/install/install-native_0.1.bb diff --git a/packages/cron/cron-3.0pl1/install-sh b/packages/cron/cron-3.0pl1/install-sh deleted file mode 100755 index 0b65ee871d..0000000000 --- a/packages/cron/cron-3.0pl1/install-sh +++ /dev/null @@ -1,323 +0,0 @@ -#!/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 4e13d4c2c1..58a8806271 100644 --- a/packages/cron/cron_3.0pl1.bb +++ b/packages/cron/cron_3.0pl1.bb @@ -1,12 +1,12 @@ SECTION = "base" DESCRIPTION = "Vixie cron." LICENSE = "cron" -PR="r3" +PR="r4" +DEPENDS += "install-native" 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://install-sh \ file://init" S = "${WORKDIR}/cron${PV}" @@ -16,8 +16,6 @@ do_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 + oe_runmake 'DESTDIR=${D}' install chmod ugo+rx ${D}${sbindir}/* ${D}${bindir}/* } diff --git a/packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh b/packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh deleted file mode 100644 index 0b65ee871d..0000000000 --- a/packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh +++ /dev/null @@ -1,323 +0,0 @@ -#!/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/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb index 468561d40d..09d267a9c8 100644 --- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb +++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb @@ -1,10 +1,10 @@ SECTION = "console/network" DEPENDS = "cyrus-sasl db" LICENSE = "BSD" -PR = "r1" +PR = "r2" +DEPENDS += "install-native" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \ - file://install-sh \ file://autotools.patch;patch=1 \ file://tail.patch;patch=1" @@ -23,9 +23,3 @@ TARGET_CPPFLAGS =+ "-I${STAGING_DIR}/${TARGET_SYS}/include/db4" # All, lib/foo.c includes from the top level directory and # is natively compiled BUILD_CPPFLAGS += " -I${S} -I${S}/et" - -do_install () { - # This will make the -s option work somewhat portably cross - # platform - STRIPPROG="$STRIP" oe_runmake 'DESTDIR=${D}' INSTALL='sh ${WORKDIR}/install-sh' install -} diff --git a/packages/install/.mtn2git_empty b/packages/install/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/install/files/.mtn2git_empty b/packages/install/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/install/files/install-sh b/packages/install/files/install-sh new file mode 100644 index 0000000000..0b65ee871d --- /dev/null +++ b/packages/install/files/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/install/install-native_0.1.bb b/packages/install/install-native_0.1.bb new file mode 100644 index 0000000000..2ae7df615a --- /dev/null +++ b/packages/install/install-native_0.1.bb @@ -0,0 +1,25 @@ +# This package uses the GNU autotools install-sh script to implement +# a target-capable 'install' command. +DESCRIPTION = "Target install command" +MAINTAINER = "John Bowler " +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "MIT" +INHIBIT_DEFAULT_DEPS = "1" + +SRC_URI = "file://install-sh" + +PACKAGES = "" +S = "${WORKDIR}" + +do_stage() { + # When the install command is executed 'STRIP' is defined correctly in + # the environment + rm -f ${STAGING_BINDIR}/install-sh + cp install-sh ${STAGING_BINDIR}/install-sh + chmod 755 ${STAGING_BINDIR}/install-sh + rm -f ${STAGING_BINDIR}/install + echo '#!/bin/sh' >${STAGING_BINDIR}/install + echo 'STRIPPROG="$STRIP" exec sh "${STAGING_BINDIR}/install-sh" "$@"' >>${STAGING_BINDIR}/install + chmod 755 ${STAGING_BINDIR}/install +} diff --git a/packages/mgetty/mgetty_1.1.30.bb b/packages/mgetty/mgetty_1.1.30.bb index e06249051f..2760b4717e 100644 --- a/packages/mgetty/mgetty_1.1.30.bb +++ b/packages/mgetty/mgetty_1.1.30.bb @@ -43,6 +43,11 @@ SRC_URI = "http://nslu.sf.net/downloads/mgetty_1.1.30.orig.tar.gz \ CFLAGS_prepend = "-DAUTO_PPP -DFIDO " +# This is necessary because of the way the mgetty Makefile works, +# it effectively recursively makes . - without passing MAKE the -e +# flag. Oops. +export MAKE = "make -e" + do_compile () { cp ${WORKDIR}/policy.h ${WORKDIR}/voice-defs.h . ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ -- cgit v1.2.3 From 145b644de0d3567c07c111990a296dcba76f675a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 13 Jul 2005 19:45:22 +0000 Subject: Added mpd --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 467c9ff20e..906a207f6c 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -60,6 +60,7 @@ OPENSLUG_PACKAGES = "\ libxml2 \ miau \ microcom \ + mpd \ mt-daapd \ mutt \ mysql \ -- cgit v1.2.3 From 19557210541b64bee9f375ffce7a13f51c4fac2d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Jul 2005 23:21:13 +0000 Subject: Add console, ncurses, gtk+, and glurp musicpd players courtesy Justin Patrin. --- packages/musicpd/.mtn2git_empty | 0 packages/musicpd/glurp_0.11.3.bb | 13 +++++++++++++ packages/musicpd/gmpc_0.11.2.bb | 13 +++++++++++++ packages/musicpd/mpc_0.11.2.bb | 10 ++++++++++ packages/musicpd/ncmpc_0.11.1.bb | 11 +++++++++++ 5 files changed, 47 insertions(+) create mode 100644 packages/musicpd/.mtn2git_empty create mode 100644 packages/musicpd/glurp_0.11.3.bb create mode 100644 packages/musicpd/gmpc_0.11.2.bb create mode 100644 packages/musicpd/mpc_0.11.2.bb create mode 100644 packages/musicpd/ncmpc_0.11.1.bb diff --git a/packages/musicpd/.mtn2git_empty b/packages/musicpd/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/musicpd/glurp_0.11.3.bb b/packages/musicpd/glurp_0.11.3.bb new file mode 100644 index 0000000000..b74100a985 --- /dev/null +++ b/packages/musicpd/glurp_0.11.3.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "glurp - frontend for mpd" +HOMEPAGE = "http://www.musicpd.org/glurp.shtml" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin " +SECTION = "gnome/multimedia" +DEPENDS = "gtk+ libglade" +PR = "r0" + +SRC_URI = "http://mercury.chem.pitt.edu/~shank/glurp-${PV}.tar.gz" + +LDFLAGS += "-export-dynamic" + +inherit autotools diff --git a/packages/musicpd/gmpc_0.11.2.bb b/packages/musicpd/gmpc_0.11.2.bb new file mode 100644 index 0000000000..f69b7f89a7 --- /dev/null +++ b/packages/musicpd/gmpc_0.11.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "GTK+ Frontend for mpd" +HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin " +SECTION = "gnome/multimedia" +DEPENDS = "gtk+ libglade" +PR = "r0" + +SRC_URI = "http://mercury.chem.pitt.edu/~shank/gmpc-${PV}.tar.gz" + +LDFLAGS += "-export-dynamic" + +inherit autotools diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb new file mode 100644 index 0000000000..ae643b5e0a --- /dev/null +++ b/packages/musicpd/mpc_0.11.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" +HOMEPAGE = "http://www.musicpd.org/mpc.shtml" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin " +SECTION = "console/multimedia" +PR = "r0" + +SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" + +inherit autotools diff --git a/packages/musicpd/ncmpc_0.11.1.bb b/packages/musicpd/ncmpc_0.11.1.bb new file mode 100644 index 0000000000..12677b6c70 --- /dev/null +++ b/packages/musicpd/ncmpc_0.11.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Ncurses based Music Player Daemon (mpd) Client" +HOMEPAGE = "http://www.musicpd.org/ncmpc.shtml" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin " +SECTION = "console/multimedia" +DEPENDS = "ncurses glib-2.0" +PR = "r0" + +SRC_URI = "http://mercury.chem.pitt.edu/~shank/ncmpc-${PV}.tar.gz" + +inherit autotools -- cgit v1.2.3 From b2cc77eeaa80156b8b4928fcd824438ea182201b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 13 Jul 2005 23:24:57 +0000 Subject: gmpc: add dependency to gnome-vfs. thanks reenoo --- packages/musicpd/gmpc_0.11.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/musicpd/gmpc_0.11.2.bb b/packages/musicpd/gmpc_0.11.2.bb index f69b7f89a7..3aba7fcc6a 100644 --- a/packages/musicpd/gmpc_0.11.2.bb +++ b/packages/musicpd/gmpc_0.11.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" LICENSE = "GPLv2" MAINTAINER = "Justin Patrin " SECTION = "gnome/multimedia" -DEPENDS = "gtk+ libglade" -PR = "r0" +DEPENDS = "gtk+ libglade gnome-vfs" +PR = "r1" SRC_URI = "http://mercury.chem.pitt.edu/~shank/gmpc-${PV}.tar.gz" -- cgit v1.2.3 From b4e3359cd09563ec5346ef3d3e6f9d020d93f49a Mon Sep 17 00:00:00 2001 From: Jonathan McDowell Date: Thu, 14 Jul 2005 06:27:55 +0000 Subject: Fix compilation of uicmoc-native under gcc4 --- packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch | 12 ++++++++++++ packages/uicmoc/uicmoc-native_2.3.10.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch diff --git a/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch b/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch new file mode 100644 index 0000000000..633fe86c29 --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/gcc4.patch @@ -0,0 +1,12 @@ +--- qt-2.3.10/src/kernel/qwindowsystem_qws.h.orig 2005-07-13 20:23:30.061728456 +0100 ++++ qt-2.3.10/src/kernel/qwindowsystem_qws.h 2005-07-13 20:37:57.183905848 +0100 +@@ -168,6 +168,9 @@ + class QWSMouseHandler; + struct QWSCommandStruct; + ++class QWSInputMethod; ++class QWSGestureMethod; ++ + #ifndef QT_NO_QWS_MULTIPROCESS + class QWSServer : public QWSServerSocket + #else diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index 7d39cc15eb..a596ec6824 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -7,7 +7,8 @@ PR = "r0" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://fix-makefile.patch;patch=1 \ - file://gcc3_4.patch;patch=1" + file://gcc3_4.patch;patch=1" \ + file://gcc4.patch;patch=1" S = "${WORKDIR}/qt-${PV}" inherit native qmake-base -- cgit v1.2.3 From 63048702254b15cd3fadf3bc81c6b6ee4707de43 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 14 Jul 2005 09:41:21 +0000 Subject: abiword: add missing dependancy on libxml2 --- packages/abiword/abiword_2.0.14.bb | 2 +- packages/abiword/abiword_2.2.7.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/abiword/abiword_2.0.14.bb b/packages/abiword/abiword_2.0.14.bb index 2b17edb4d8..e79da688ae 100644 --- a/packages/abiword/abiword_2.0.14.bb +++ b/packages/abiword/abiword_2.0.14.bb @@ -1,6 +1,6 @@ DESCRIPTION = "AbiWord Word Processor" -DEPENDS = "cdump-native libfribidi enchant jpeg libpng perl glibc" +DEPENDS = "cdump-native libfribidi enchant jpeg libpng perl glibc libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" diff --git a/packages/abiword/abiword_2.2.7.bb b/packages/abiword/abiword_2.2.7.bb index 58098b797f..de857a4abc 100644 --- a/packages/abiword/abiword_2.2.7.bb +++ b/packages/abiword/abiword_2.2.7.bb @@ -3,10 +3,10 @@ HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" -DEPENDS = "cdump-native libglade libfribidi enchant jpeg libpng perl glibc" +DEPENDS = "cdump-native libglade libfribidi enchant jpeg libpng perl glibc libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -PR="r2" +PR="r3" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://cdump-hack.patch;patch=1" -- cgit v1.2.3 From f36c66e2983e5a142701696199417c1bae94ddff Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 14 Jul 2005 12:13:58 +0000 Subject: Added initscript --- packages/thttpd/files/init | 47 +++++++++++++++++++++++++++++++++++++++++ packages/thttpd/thttpd_2.25b.bb | 8 ++++++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 packages/thttpd/files/init diff --git a/packages/thttpd/files/init b/packages/thttpd/files/init new file mode 100644 index 0000000000..4e227d9f13 --- /dev/null +++ b/packages/thttpd/files/init @@ -0,0 +1,47 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/thttpd and type +# > update-rc.d thttpd defaults 60 +# + + +thttpd=/usr/sbin/thttpd +test -x "$thttpd" || exit 0 + + +case "$1" in + start) + echo -n "Starting thttpd" + start-stop-daemon --start --quiet --exec $thttpd + echo "." + ;; + stop) + echo -n "Stopping thttpd" + start-stop-daemon --stop --quiet $thttpd + echo "." + ;; + reload|force-reload) + start-stop-daemon --stop --quiet --signal 1 --exec $thttpd + ;; + restart) + echo -n "Stopping thttpd" + start-stop-daemon --stop --quiet $thttpd + echo "." + echo -n "Waiting for thttpd to die off" + for i in 1 2 3 ; + do + sleep 1 + echo -n "." + done + echo "" + echo -n "Starting thttpd" + start-stop-daemon --start --quiet --exec $thttpd + echo "." + ;; + *) + echo "Usage: /etc/init.d/thttpd {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb index b3d179a0ee..280b2dee7e 100644 --- a/packages/thttpd/thttpd_2.25b.bb +++ b/packages/thttpd/thttpd_2.25b.bb @@ -5,7 +5,8 @@ HOMEPAGE = "http://www.acme.com/software/thttpd/" SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \ file://install.patch;patch=1 \ - file://acinclude.m4" + file://acinclude.m4 \ + file://init" S = "${WORKDIR}/thttpd-${PV}" inherit autotools @@ -17,3 +18,8 @@ do_configure () { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ autotools_do_configure } + +do_install_append () { + install -d "${D}${sysconfdir}/init.d" + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/thttpd +} -- cgit v1.2.3 From 6b1a50e77050d8d0e5ccb230a10240bd1a85a323 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 14 Jul 2005 13:12:10 +0000 Subject: Updated initscript Added thttpd to packages --- packages/meta/openslug-packages.bb | 1 + packages/thttpd/files/init | 4 ++-- packages/thttpd/thttpd_2.25b.bb | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 906a207f6c..748a7d8ca2 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -83,6 +83,7 @@ OPENSLUG_PACKAGES = "\ python \ samba \ sane-backends \ + thttpd \ vlan \ wget \ unionfs-modules unionfs-utils \ diff --git a/packages/thttpd/files/init b/packages/thttpd/files/init index 4e227d9f13..fdcd0f4530 100644 --- a/packages/thttpd/files/init +++ b/packages/thttpd/files/init @@ -18,7 +18,7 @@ case "$1" in ;; stop) echo -n "Stopping thttpd" - start-stop-daemon --stop --quiet $thttpd + start-stop-daemon --stop --quiet --exec $thttpd echo "." ;; reload|force-reload) @@ -26,7 +26,7 @@ case "$1" in ;; restart) echo -n "Stopping thttpd" - start-stop-daemon --stop --quiet $thttpd + start-stop-daemon --stop --quiet --exec $thttpd echo "." echo -n "Waiting for thttpd to die off" for i in 1 2 3 ; diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb index 280b2dee7e..e7b786c1b0 100644 --- a/packages/thttpd/thttpd_2.25b.bb +++ b/packages/thttpd/thttpd_2.25b.bb @@ -2,12 +2,15 @@ DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server." LICENSE = "BSD" MAINTAINER = "Chris Larson " HOMEPAGE = "http://www.acme.com/software/thttpd/" +PR="r1" SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \ file://install.patch;patch=1 \ file://acinclude.m4 \ file://init" S = "${WORKDIR}/thttpd-${PV}" +INITSCRIPT_NAME = "thttpd" +INITSCRIPT_PARAMS = "defaults" inherit autotools -- cgit v1.2.3