From 287dcd82077e78f3d8e4277fcb85cc622daff695 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 17 Jul 2005 12:56:25 +0000 Subject: Updated the ftpd-topfield init script to match the Optware version --- packages/ftpd-topfield/files/init | 2 +- packages/ftpd-topfield/ftpd-topfield_0.5.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ftpd-topfield/files/init b/packages/ftpd-topfield/files/init index a4cd501e10..0816e8bb7d 100644 --- a/packages/ftpd-topfield/files/init +++ b/packages/ftpd-topfield/files/init @@ -2,7 +2,7 @@ DAEMON=/usr/sbin/ftpd-topfield NAME=ftpd-topfield DESC="FTP daemon for the Topfield PVR" -ARGS="-D -e" +ARGS="-D -P 21 -e" test -f $DAEMON || exit 0 diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb index 625cbe28fb..102a65d46a 100644 --- a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb +++ b/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb @@ -1,5 +1,5 @@ # This package builds the ftpd-topfield program -PR = "r0" +PR = "r1" DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" HOMEPAGE = "http://sourceforge.net/projects/puppy" MAINTAINER = "NSLU2 Linux " -- cgit v1.2.3 From db5f69fd2cc3ca3053b899237dfde27ed9134950 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 17 Jul 2005 13:05:46 +0000 Subject: Updated ftpd-topfield to version 0.5.2 --- packages/ftpd-topfield/ftpd-topfield_0.5.1.bb | 39 --------------------------- packages/ftpd-topfield/ftpd-topfield_0.5.2.bb | 39 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 packages/ftpd-topfield/ftpd-topfield_0.5.1.bb create mode 100644 packages/ftpd-topfield/ftpd-topfield_0.5.2.bb diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb deleted file mode 100644 index 102a65d46a..0000000000 --- a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -# This package builds the ftpd-topfield program -PR = "r1" -DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" -HOMEPAGE = "http://sourceforge.net/projects/puppy" -MAINTAINER = "NSLU2 Linux " -SECTION = "net" -LICENSE = "MIT" - -DEPENDS = "libusb" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_1 \ - cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \ - file://init" - -# The source will end up in the subdirectory 'ftpd-topfield' - no release name -S = "${WORKDIR}/ftpd-topfield" -SL = "${WORKDIR}/libtopfield" - -inherit update-rc.d - -INITSCRIPT_NAME = "ftpd-topfield" -INITSCRIPT_PARAMS = "defaults" - -# Just the one package at present -PACKAGES = "${PN}" - -inherit autotools - -do_compile() { - oe_runmake -C ${SL} libtopfield.a - oe_runmake LDLIBS="${LDFLAGS} -L ../libtopfield -ltopfield -lusb" -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield - install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield -} diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb new file mode 100644 index 0000000000..6a6665c8ed --- /dev/null +++ b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb @@ -0,0 +1,39 @@ +# This package builds the ftpd-topfield program +PR = "r0" +DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" +HOMEPAGE = "http://sourceforge.net/projects/puppy" +MAINTAINER = "NSLU2 Linux " +SECTION = "net" +LICENSE = "MIT" + +DEPENDS = "libusb" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_2 \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \ + file://init" + +# The source will end up in the subdirectory 'ftpd-topfield' - no release name +S = "${WORKDIR}/ftpd-topfield" +SL = "${WORKDIR}/libtopfield" + +inherit update-rc.d + +INITSCRIPT_NAME = "ftpd-topfield" +INITSCRIPT_PARAMS = "defaults" + +# Just the one package at present +PACKAGES = "${PN}" + +inherit autotools + +do_compile() { + oe_runmake -C ${SL} libtopfield.a + oe_runmake LDLIBS="${LDFLAGS} -L ../libtopfield -ltopfield -lusb" +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield + install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield +} -- cgit v1.2.3 From 7279d75be5455744430a3126ab800062375b38bf Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 18 Jul 2005 19:40:57 +0000 Subject: Fix for slugbug 197. This no longer runs udhcp to get the network address if /etc/default/sysconf has bootproto=static This affects network boot (nfs) only - previously a DHCP address would be used in preference to the specified static one. All NFS root users please test this - the number of failure cases are large and a failure may leave the system unbootable. --- packages/openslug-init/openslug-init-0.10/functions | 11 +++++++---- packages/openslug-init/openslug-init_0.10.bb | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions index ac8e195abd..61b5eb2776 100755 --- a/packages/openslug-init/openslug-init-0.10/functions +++ b/packages/openslug-init/openslug-init-0.10/functions @@ -209,10 +209,13 @@ ifup(){ # is not left running so this will only work for # the lease length time! ifconfig "$iface" up - test -n "$hostname" && HOSTNAME="-H $hostname" - # The script writes the required shell variable assignments - # to file descriptor 9 - eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null) + if test "$(config boot)" != static + then + test -n "$hostname" && HOSTNAME="-H $hostname" + # The script writes the required shell variable assignments + # to file descriptor 9 + eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null) + fi test -n "$broadcast" && BROADCAST="broadcast $broadcast" test -n "$subnet" && NETMASK="netmask $subnet" diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index 59b8c0fd5d..60726d8dc2 100644 --- a/packages/openslug-init/openslug-init_0.10.bb +++ b/packages/openslug-init/openslug-init_0.10.bb @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r38" +PR = "r39" SRC_URI = "file://linuxrc \ file://boot/flash \ -- cgit v1.2.3 From 8fa33a74e5e03da530dc306e5ca43a417d4c4998 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 18 Jul 2005 19:47:57 +0000 Subject: slugbug 205 Ensure that /home/root still exists, even though the root home directory is /root because install passwd files are not typically overwritten on upgrade and, without this, it may be impossible to log in to the system. PR bumped, but this only affects openslug --- packages/base-files/base-files_3.0.14.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index d546ed5c09..ec58e08bef 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r37" +PR = "r38" LICENSE = "GPL" SRC_URI = " \ @@ -126,6 +126,7 @@ do_install_append_openslug() { rm -r ${D}/mnt/* rmdir ${D}/home/root install -m 0755 -d ${D}/root + ln -s ../root ${D}/home/root } PACKAGES = "${PN}-doc ${PN}" -- cgit v1.2.3