diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/meta/openslug-packages.bb | 2 | ||||
| -rw-r--r-- | packages/thttpd/files/init | 8 | ||||
| -rw-r--r-- | packages/thttpd/thttpd_2.25b.bb | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 748a7d8ca2..7e2c044b19 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -29,9 +29,11 @@ OPENSLUG_DEVELOPMENT = "\ monotone \ ncurses \ openssh \ + patch \ pciutils \ quilt \ sed \ + util-linux \ " # These packages only build on TARGET_OS=linux, not diff --git a/packages/thttpd/files/init b/packages/thttpd/files/init index fdcd0f4530..df6d64842c 100644 --- a/packages/thttpd/files/init +++ b/packages/thttpd/files/init @@ -13,7 +13,7 @@ test -x "$thttpd" || exit 0 case "$1" in start) echo -n "Starting thttpd" - start-stop-daemon --start --quiet --exec $thttpd + start-stop-daemon --start --quiet --exec $thttpd -- -d @@SRVDIR echo "." ;; stop) @@ -22,11 +22,11 @@ case "$1" in echo "." ;; reload|force-reload) - start-stop-daemon --stop --quiet --signal 1 --exec $thttpd + start-stop-daemon --stop --quiet --signal 1 --exec $thttpd ;; restart) echo -n "Stopping thttpd" - start-stop-daemon --stop --quiet --exec $thttpd + start-stop-daemon --stop --quiet --exec $thttpd -- -d @@SRVDIR echo "." echo -n "Waiting for thttpd to die off" for i in 1 2 3 ; @@ -36,7 +36,7 @@ case "$1" in done echo "" echo -n "Starting thttpd" - start-stop-daemon --start --quiet --exec $thttpd + start-stop-daemon --start --quiet --exec $thttpd -- -d @@SRVDIR echo "." ;; *) diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb index e7b786c1b0..9a3ac3af11 100644 --- a/packages/thttpd/thttpd_2.25b.bb +++ b/packages/thttpd/thttpd_2.25b.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server." LICENSE = "BSD" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://www.acme.com/software/thttpd/" -PR="r1" +PR="r2" SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \ file://install.patch;patch=1 \ @@ -24,5 +24,6 @@ do_configure () { do_install_append () { install -d "${D}${sysconfdir}/init.d" - install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/thttpd + cat ${WORKDIR}/init | sed -e 's,@@SRVDIR,${servicedir}/www,g' > ${WORKDIR}/thttpd + install -c -m 755 ${WORKDIR}/thttpd ${D}${sysconfdir}/init.d/thttpd } |