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 f9001e422703872bdeacfbb7b20dff8a31877a33 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 18 Jul 2005 15:45:13 +0000 Subject: python: install libpython-2.4.{a|so} into staging area --- packages/python/python_2.4.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/python/python_2.4.1.bb b/packages/python/python_2.4.1.bb index 5dc3542475..09febc9274 100644 --- a/packages/python/python_2.4.1.bb +++ b/packages/python/python_2.4.1.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " PROVIDES = "python python-core" DEPENDS = "python-native readline zlib gdbm openssl" -PR = "ml6" +PR = "ml7" PYTHON_MAJMIN = "2.4" @@ -47,6 +47,7 @@ do_compile() { do_stage() { install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + oe_libinstall -a -so libpython2.4 ${STAGING_LIBDIR} } do_install() { -- 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 From 1c87ee48b7a6e4adea79103d960194cd63519da5 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 18 Jul 2005 21:33:42 +0000 Subject: tosa.conf: add missing dependency to wlan-ng-utils --- conf/machine/tosa-2.4.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf index e33de0582e..22ade477e2 100644 --- a/conf/machine/tosa-2.4.conf +++ b/conf/machine/tosa-2.4.conf @@ -1,6 +1,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" -BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \ + +BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \ orinoco-modules sharp-sdmmc-support usbutils" BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ -- cgit v1.2.3 From 6fbd7684be0328ec9e37fd923438d739c7b2ca69 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 18 Jul 2005 22:11:57 +0000 Subject: zaurus-updater: recognize zimage.bin for tosa --- packages/zaurus-updater/tosa/updater.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/zaurus-updater/tosa/updater.sh b/packages/zaurus-updater/tosa/updater.sh index e22edbf19a..5adfa97a1e 100644 --- a/packages/zaurus-updater/tosa/updater.sh +++ b/packages/zaurus-updater/tosa/updater.sh @@ -67,7 +67,7 @@ then ./consolescroll fi -for TARGETFILE in zImage zimage ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN +for TARGETFILE in zImage zimage.bin ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN do if [ -e $TARGETFILE ] then @@ -78,8 +78,8 @@ do #echo $TARGETFILE':'$DATASIZE'bytes' TARGETTYPE=Invalid case "$TARGETFILE" in -## zImage) TARGETTYPE=Kernel;; - zimage) TARGETTYPE=Kernel;; + zImage) TARGETTYPE=Kernel;; + zimage.bin) TARGETTYPE=Kernel;; ZIMAGE) TARGETTYPE=Kernel;; initrd.bin) TARGETTYPE=RoFs;; INITRD.BIN) TARGETTYPE=RoFs;; -- cgit v1.2.3 From d1501698eec277d80d74d6d5a3e67f2a898cf39a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 18 Jul 2005 22:20:59 +0000 Subject: Add libgpewidget to depends --- packages/libgpelaunch/libgpelaunch_0.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libgpelaunch/libgpelaunch_0.12.bb b/packages/libgpelaunch/libgpelaunch_0.12.bb index 3178955d79..d42414d0d0 100644 --- a/packages/libgpelaunch/libgpelaunch_0.12.bb +++ b/packages/libgpelaunch/libgpelaunch_0.12.bb @@ -2,7 +2,7 @@ LICENSE = "LGPL" DESCRIPTION = "GPE program launcher library" SECTION = "libs" MAINTAINER = "Philip Blundell " -DEPENDS = "gtk+ startup-notification" +DEPENDS = "gtk+ libgpewidget startup-notification" inherit autotools pkgconfig -- cgit v1.2.3 From fa09bf15aa200c6baed97dd4fd1b9384250eb0b4 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 19 Jul 2005 01:54:35 +0000 Subject: Remove timestamp issues caused by the compilation of dftables external to the makefile (doesn't work when using ccache on a fast system because it attempts to rebuild dftables within the makefile). The change fixes the original problem that dftables was compiled by default with the target compiler. --- packages/pcre/pcre_4.4.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb index 5ba7a1298b..609a808891 100644 --- a/packages/pcre/pcre_4.4.bb +++ b/packages/pcre/pcre_4.4.bb @@ -19,9 +19,11 @@ CFLAGS_append = " -D_REENTRANT" EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000" do_compile () { - ${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c dftables.c - ${BUILD_CC} dftables.o -o dftables - oe_runmake + # The generation of dftables can lead to timestamp problems with ccache + # because the generated config.h seems newer. It is sufficient to ensure that the + # attempt to build dftables inside make will actually work (foo_FOR_BUILD is + # only used for this). + oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}" } do_stage () { -- cgit v1.2.3 From 551478b744df4faaa3e63b1b052b2e95c6345778 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 19 Jul 2005 03:08:44 +0000 Subject: Makefile.in was patched to change ${CC} to cc for something which needed BUILD_CC, but the target CFLAGS were still there, preventing the target cflags containing anything which only works with TARGET_CC. Fixed to use BUILD_CC, BUILD_CFLAGS and BULD_LDFLAGS - still a hack because these come in 'by magic' from the environment, but that's fine in OE builds because they are always set by the do_compile script. --- packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch index e8b6ba59b5..0f97865c3f 100644 --- a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch +++ b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch @@ -5,7 +5,7 @@ gen: gen.c - ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} -+ cc ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} ++ ${BUILD_CC} ${EXT_CFLAGS} ${BUILD_CFLAGS} ${ALL_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} rbtdb64.@O@: rbtdb.c -- cgit v1.2.3 From e76d9a8ba9c798803949a61da8d5e72c66ec7f7b Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 19 Jul 2005 06:01:37 +0000 Subject: Modified FULL_OPTIMIZATION for NSLU2 --- conf/machine/nslu2.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 1484ac191c..2ce73ac836 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -19,6 +19,14 @@ IMAGE_ROOTFS_SIZE_ext2.gz = "10240" TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" PACKAGE_ARCH = "armeb" +# Optimization settings. Os works fine and is significantly +# better than O2. The other settings are somewhat arbitrary. +# The optimisations chosen here include the ones which 'break' +# symbolic debugging (because the compiler does not include +# enough information to allow the debugger to know where given +# values are.) +FULL_OPTIMIZATION = "-fomit-frame-pointer -frename-registers -fweb -funit-at-a-time -Os" + SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" -- cgit v1.2.3 From 1b45793e53bc6eb1ac71ef2f051359b674815788 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 19 Jul 2005 06:31:56 +0000 Subject: slugbug 206: fix the tmpfs directories in NFS slugbug 207: fix the flashdisk mount so that it works in the presence of an existing readonly mount (turnup, like reflash, now removes all existing flashdisk mounts) --- .../openslug-init/openslug-init-0.10/functions | 75 ++++++++++++++++++++-- packages/openslug-init/openslug-init-0.10/reflash | 54 ++-------------- packages/openslug-init/openslug-init-0.10/turnup | 32 +++++++-- packages/openslug-init/openslug-init_0.10.bb | 2 +- 4 files changed, 101 insertions(+), 62 deletions(-) diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions index 61b5eb2776..43b109977d 100755 --- a/packages/openslug-init/openslug-init-0.10/functions +++ b/packages/openslug-init/openslug-init-0.10/functions @@ -239,11 +239,18 @@ ifdown(){ ifconfig "$1" down } # -# mountflash "flash root directory" {mount options} +# mountflash "flash device" "flash root directory" {mount options} # Finds and mounts the flash file system on the given directory mountflash() { local ffsdev ffsdir + ffsdev="$1" + test -n "$ffsdev" -a -b "$ffsdev" || { + echo "$0: unable to find flash file system to copy ($ffsdev)" >&2 + return 1 + } + shift + ffsdir="$1" test -n "$ffsdir" -a -d "$ffsdir" || { echo "$0: mountflash $ffsdir: not a directory (internal error)" >&2 @@ -251,14 +258,70 @@ mountflash() { } shift - ffsdev="$(mtblockdev Flashdisk)" - test -n "$ffsdev" -a -b "$ffsdev" || { - echo "$0: unable to find flash file system to copy ($ffsdev)" >&2 - return 1 - } mount -t jffs2 "$@" "$ffsdev" "$ffsdir" || { echo "$0: $ffsdev: unable to mount flash file system on $ffsdir" >&2 return 1 } return 0 } +# +# umountflash [-r] "flash device" +# unmount any instance of the given flash device, if -r is specified a mount on +# root is an error, otherwise a mount on root is ignored (and remains). +umountflash() { + local rootok ffsno ffsdev + rootok=1 + case "$1" in + -r) rootok= + shift;; + esac + # + # The argument is ffsdev + ffsdev="$1" + ffsno="$(devio "<<$ffsdev" prd)" + test -n "$ffsno" -a "$ffsno" -ge 0 || { + echo "$0: $ffsdev: device number $ffsno is not valid, cannot continue." >&2 + return 1 + } + # + # Make sure that Flashdisk isn't mounted on / + if test -z "$rootok" -a "$(devio "<&2 + return 1 + fi + # + # The function is currently always used interactively, so output + echo "$0: umounting any existing mount of $ffsdev" >&2 + # + # check each mount point, do this last first because otherwise nested + # mounts of ffsdev cannot be umounted. + ffs_umount() { + local device mp type options stuff + + read device mp type options stuff + test -z "$device" && return 0 + + # handle following entries first + ffs_umount || return 1 + + # handle this entry, since this is currently only used for unmounting + # the flash root partition we know a file which must exist... + case "$type" in + jffs2) test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" || + umount "$mp" || { + echo "$0: $mp: unable to umount $ffsdev" >&2 + return 1 + };; + esac + + return 0 + } + # + ffs_umount &2 + return 1 + } + + return 0 +} diff --git a/packages/openslug-init/openslug-init-0.10/reflash b/packages/openslug-init/openslug-init-0.10/reflash index 504e78f694..bcf51fc606 100644 --- a/packages/openslug-init/openslug-init-0.10/reflash +++ b/packages/openslug-init/openslug-init-0.10/reflash @@ -213,59 +213,15 @@ then exit 1 } fi -# -# find the device number of the flash partition then make sure it isn't -# mounted anywhere. -if test -n "$ffsdev" -then - ffsno="$(devio "<<$ffsdev" prd)" - test -n "$ffsno" -a "$ffsno" -ge 0 || { - echo "reflash: $ffsdev: device number $ffsno is not valid, cannot continue." >&2 - exit 1 - } - # - # Make sure that Flashdisk isn't mounted on / - if test "$(devio "<&2 - exit 1 - fi -fi + # # INPUTS OK, ENVIRONMENT OK, UMOUNT ANY EXISTING MOUNT OF THE FLASHDISK # --------------------------------------------------------------------- # This is only required if the device is going to be used if test -n "$ffsdev" then - echo "reflash: umounting any existing mount of $ffsdev" >&2 - # - # check each mount point, do this last first because otherwise nested - # mounts of ffsdev cannot be umounted. - ffs_umount() { - local device mp type options stuff - - read device mp type options stuff - test -z "$device" && return 0 - - # handle following entries first - ffs_umount || return 1 - - # handle this entry - case "$type" in - jffs2) test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd)" -ne "$ffsno" || - umount "$mp" || { - echo "reflash: $mp: unable to umount $ffsdev" >&2 - return 1 - };; - esac - - return 0 - } - # - ffs_umount &2 - exit 1 - } + # -r causes this to fail if the flash device is mounted on / + umountflash -r "$ffsdev" || exit 1 # # Everything is umounted, now remount on a temporary directory. ffsdir="/tmp/flashdisk.$$" @@ -274,7 +230,7 @@ then exit 1 } # - mountflash "$ffsdir" -o ro || { + mountflash "$ffsdev" "$ffsdir" -o ro || { rmdir "$ffsdir" exit 1 } @@ -471,7 +427,7 @@ echo "reflash: restoring saved configuration files" >&2 # /etc/rcS.d/S99finish on first boot (if it does not exist). We need # a timestamp earlier than any files we create so touch it here, this # also acts as a test on the mounted file system -mountflash "$ffsdir" && :>"$ffsdir/etc/.configured" || { +mountflash "$ffsdev" "$ffsdir" && :>"$ffsdir/etc/.configured" || { rmdir "$ffsdir" echo "reflash: mount of new flash root file system failed" >&2 if test -d "$ffsdir/etc" diff --git a/packages/openslug-init/openslug-init-0.10/turnup b/packages/openslug-init/openslug-init-0.10/turnup index ce504b022e..0029697c50 100644 --- a/packages/openslug-init/openslug-init-0.10/turnup +++ b/packages/openslug-init/openslug-init-0.10/turnup @@ -4,10 +4,13 @@ # . /etc/default/functions +# +# configuration +# The following variables control which directories in /var end up on the rootfs +# and which end up in a temporary file system. INRAM_MEMSTICK="/var/cache /var/lock /var/log /var/run /var/tmp /var/lib/ipkg" -INRAM_NFS="/var/cache /var/run" +INRAM_NFS="/var/cache /var/lock /var/run /var/tmp" INRAM_DISK="" - # # force: override certain checks force= @@ -61,6 +64,23 @@ fsoptions() { fi } # +# get_flash {mount options} +# mount the flash device, writeable, on the given directory +get_flash() { + local ffsdir ffsdev + + ffsdir="$1" + shift + test -n "$ffsdir" -a -d "$ffsdir" || { + echo "$0: $ffsdir: internal error, flash mount point not a directory" >&2 + return 1 + } + + ffsdev="$(mtblockdev Flashdisk)" + umountflash "$ffsdev" && + mountflash "$ffsdev" "$ffsdir" "$@" +} +# # check_rootfs [-i] # Make sure the candidate rootfs is empty check_rootfs() { @@ -425,7 +445,7 @@ disk() { } # make sure we can get to the flash file system first - mountflash "$ffs" || { + get_flash "$ffs" || { rmdir "$new" "$ffs" return 1 } @@ -509,7 +529,7 @@ boot_reset() { return 1 } - mountflash "$ffs" || { + get_flash "$ffs" || { rmdir "$ffs" return 1 } @@ -558,7 +578,7 @@ nfs() { } # make sure we can get to the flash file system first - mountflash "$ffs" || { + get_flash "$ffs" || { rmdir "$new" "$ffs" return 1 } @@ -670,7 +690,7 @@ fix_hw_addr() { # this isn't the flash device ffs="/tmp/flashdisk.$$" # make sure we can get to the flash file system first - mountflash "$ffs" || { + get_flash "$ffs" || { rmdir "$ffs" return 1 } diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index 60726d8dc2..fd2080ff65 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 = "r39" +PR = "r40" SRC_URI = "file://linuxrc \ file://boot/flash \ -- cgit v1.2.3 From 8e869b70b908cf60ed699d39b490a8417ecb1a63 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 19 Jul 2005 08:47:52 +0000 Subject: updated kdepimpi to 2.1.16 --- packages/kdepimpi/kdepimpi_2.1.13.bb | 3 --- packages/kdepimpi/kdepimpi_2.1.16.bb | 3 +++ packages/kdepimpi/pwmpi_2.1.13.bb | 3 --- packages/kdepimpi/pwmpi_2.1.16.bb | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 packages/kdepimpi/kdepimpi_2.1.13.bb create mode 100644 packages/kdepimpi/kdepimpi_2.1.16.bb delete mode 100644 packages/kdepimpi/pwmpi_2.1.13.bb create mode 100644 packages/kdepimpi/pwmpi_2.1.16.bb diff --git a/packages/kdepimpi/kdepimpi_2.1.13.bb b/packages/kdepimpi/kdepimpi_2.1.13.bb deleted file mode 100644 index f3dde1a2fd..0000000000 --- a/packages/kdepimpi/kdepimpi_2.1.13.bb +++ /dev/null @@ -1,3 +0,0 @@ -SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz " - -include kdepimpi-base.inc diff --git a/packages/kdepimpi/kdepimpi_2.1.16.bb b/packages/kdepimpi/kdepimpi_2.1.16.bb new file mode 100644 index 0000000000..f3dde1a2fd --- /dev/null +++ b/packages/kdepimpi/kdepimpi_2.1.16.bb @@ -0,0 +1,3 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz " + +include kdepimpi-base.inc diff --git a/packages/kdepimpi/pwmpi_2.1.13.bb b/packages/kdepimpi/pwmpi_2.1.13.bb deleted file mode 100644 index 904f640955..0000000000 --- a/packages/kdepimpi/pwmpi_2.1.13.bb +++ /dev/null @@ -1,3 +0,0 @@ -include kdepimpi_${PV}.bb - -include pwmpi.inc diff --git a/packages/kdepimpi/pwmpi_2.1.16.bb b/packages/kdepimpi/pwmpi_2.1.16.bb new file mode 100644 index 0000000000..904f640955 --- /dev/null +++ b/packages/kdepimpi/pwmpi_2.1.16.bb @@ -0,0 +1,3 @@ +include kdepimpi_${PV}.bb + +include pwmpi.inc -- cgit v1.2.3 From e2401ba43b82b9cf9fa8cd29b74791bf32235545 Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Tue, 19 Jul 2005 10:00:11 +0000 Subject: updated gpsd to version 2.28 --- packages/gpsd/gpsd_2.26.bb | 2 -- packages/gpsd/gpsd_2.28.bb | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 packages/gpsd/gpsd_2.26.bb create mode 100644 packages/gpsd/gpsd_2.28.bb diff --git a/packages/gpsd/gpsd_2.26.bb b/packages/gpsd/gpsd_2.26.bb deleted file mode 100644 index cd5e223142..0000000000 --- a/packages/gpsd/gpsd_2.26.bb +++ /dev/null @@ -1,2 +0,0 @@ -include gpsd.inc - diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb new file mode 100644 index 0000000000..cd5e223142 --- /dev/null +++ b/packages/gpsd/gpsd_2.28.bb @@ -0,0 +1,2 @@ +include gpsd.inc + -- cgit v1.2.3 From d94a800980d782334360eed517c5cfc6989f8d9d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Jul 2005 10:15:14 +0000 Subject: add GNU parted 1.6.23 - patch courtesy Pigi --- packages/parted/.mtn2git_empty | 0 packages/parted/parted_1.6.23.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 packages/parted/.mtn2git_empty create mode 100644 packages/parted/parted_1.6.23.bb diff --git a/packages/parted/.mtn2git_empty b/packages/parted/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/parted/parted_1.6.23.bb b/packages/parted/parted_1.6.23.bb new file mode 100644 index 0000000000..d4182487fe --- /dev/null +++ b/packages/parted/parted_1.6.23.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "parted, the GNU partition resizing program" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin " +SECTION = "console/tools" +DEPENDS = "readline e2fsprogs-libs" +PR = "r0" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" + +EXTRA_OECONF = "--disable-Werror" + +inherit autotools -- cgit v1.2.3 From a75ff4055638369d7f0fa71b8e86a373a7e5efcb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Jul 2005 10:23:05 +0000 Subject: flite: - add configure-with-audio patch courtesy Patrick Ohly - reorder metadata - set Patrick Ohly as maintainer of this package --- packages/flite/flite-1.2/configure-with-audio.patch | 20 ++++++++++++++++++++ packages/flite/flite_1.2.bb | 11 ++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 packages/flite/flite-1.2/configure-with-audio.patch diff --git a/packages/flite/flite-1.2/configure-with-audio.patch b/packages/flite/flite-1.2/configure-with-audio.patch new file mode 100644 index 0000000000..4f320ac068 --- /dev/null +++ b/packages/flite/flite-1.2/configure-with-audio.patch @@ -0,0 +1,20 @@ +*** flite-1.2-release/configure.in~ Tue Feb 18 01:45:45 2003 +--- flite-1.2-release/configure.in Mon Jul 18 22:01:25 2005 +*************** +*** 144,150 **** + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +! AUDIODRIVER=$with_audio ) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in +--- 144,151 ---- + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +! [AUDIODRIVER=$with_audio +! AUDIODEFS=]) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb index b8696fd829..c9a3e71e92 100644 --- a/packages/flite/flite_1.2.bb +++ b/packages/flite/flite_1.2.bb @@ -1,14 +1,15 @@ -SECTION = "console/utils" -HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/" -DESCRIPTION = "festival light speech synthesizer" +DESCRIPTION = "flite - the festival light speech synthesizer" PRIORITY = "optional" +HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/" +SECTION = "console/utils" LICENSE = "flite" -MAINTAINER = "Michael 'Mickey' Lauer " -PR = "r1" +MAINTAINER = "Patrick Ohly " +PR = "r2" PARALLEL_MAKE = "" SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \ + file://configure-with-audio.patch;patch=1 \ file://fix-read-only-assignments.patch;patch=1" S = "${WORKDIR}/flite-${PV}-release" -- cgit v1.2.3 From c2d1bcfad1cff2741d507bf276702ee145c9ee31 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Jul 2005 10:37:33 +0000 Subject: put some sense into lzma-native NOTE: NEVER EVER call 'make' directly in OE - use oe_runmake and adjust CFLAGS as necessary --- packages/lzma/lzma-native_4.17.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb index a47cd1d8da..174ed700e4 100644 --- a/packages/lzma/lzma-native_4.17.bb +++ b/packages/lzma/lzma-native_4.17.bb @@ -1,19 +1,22 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compression ratio and very fast decompression." HOMEPAGE = "http://www.7-zip.org/" LICENSE = "LGPL" +PR = "r1" SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \ - file://lzma-406-zlib-stream.patch;patch=1" -S = "${WORKDIR}" + file://lzma-406-zlib-stream.patch;patch=1;pnum=2" +S = "${WORKDIR}/SRC" inherit native +CFLAGS += "-c -I${S}" + do_compile() { - make -C ${S}/SRC/7zip/Compress/LZMA_Alone - make -C ${S}/SRC/7zip/Compress/LZMA_Lib + oe_runmake -C 7zip/Compress/LZMA_Alone + oe_runmake -C 7zip/Compress/LZMA_Lib } do_stage () { - install -m 0755 ${S}/SRC/7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR} - oe_libinstall -a ${S}/SRC/7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR} + install -m 0755 7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR} + oe_libinstall -a 7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR} } -- cgit v1.2.3 From 09fb08598b5a2f396ff71ed1352ba9c0b82abb7f Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Tue, 19 Jul 2005 11:03:18 +0000 Subject: added gaim 1.4.0 --- packages/gaim/files/desktop-name_1.4.0.patch | 11 +++++++++++ packages/gaim/gaim_1.4.0.bb | 9 +++++++++ 2 files changed, 20 insertions(+) create mode 100644 packages/gaim/files/desktop-name_1.4.0.patch create mode 100644 packages/gaim/gaim_1.4.0.bb diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/gaim/files/desktop-name_1.4.0.patch new file mode 100644 index 0000000000..3cfaa5771e --- /dev/null +++ b/packages/gaim/files/desktop-name_1.4.0.patch @@ -0,0 +1,11 @@ +--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200 ++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200 +@@ -7,7 +7,7 @@ + Terminal=false + Type=Application + +-Name=Gaim Internet Messenger ++Name=Gaim + Name[ca]=Missatger d'Internet Gaim + Name[cs]=Gaim Internet Messenger + Name[da]=Gaim - internet beskeder diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb new file mode 100644 index 0000000000..ec55ea5b94 --- /dev/null +++ b/packages/gaim/gaim_1.4.0.bb @@ -0,0 +1,9 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name_1.4.0.patch;patch=1" + +include gaim.inc + +CFLAGS += "-D_GNU_SOURCE" + -- cgit v1.2.3 From f1d95e32a275db0688d04f2d6ac255b2fb1771ba Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Tue, 19 Jul 2005 11:27:55 +0000 Subject: added sylpheed 2.0.0beta6 --- .../files/sylpheed-gnutls_2.0.0beta6.patch | 92 ++++++++++++++++++++++ packages/sylpheed/sylpheed_2.0.0beta6.bb | 30 +++++++ 2 files changed, 122 insertions(+) create mode 100644 packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch create mode 100644 packages/sylpheed/sylpheed_2.0.0beta6.bb diff --git a/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch new file mode 100644 index 0000000000..b0a03c6a32 --- /dev/null +++ b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch @@ -0,0 +1,92 @@ +--- sylpheed-2.0.0beta6/config.h.in.old 2005-07-18 11:57:23.000000000 +0200 ++++ sylpheed-2.0.0beta6/config.h.in 2005-07-18 11:59:57.000000000 +0200 +@@ -263,6 +263,9 @@ + /* Define to 1 if your declares `struct tm'. */ + #undef TM_IN_SYS_TIME + ++/* Define if you use GnuTLS to support SSL. */ ++#undef USE_GNUTLS ++ + /* Define if you use GPGME to support OpenPGP. */ + #undef USE_GPGME + +@@ -273,6 +276,9 @@ + #undef USE_LDAP + + /* Define if you use OpenSSL to support SSL. */ ++#undef USE_OPENSSL ++ ++/* Define if SSL is supported. */ + #undef USE_SSL + + /* Whether to use multithread or not */ +--- sylpheed-2.0.0beta6/configure.in.old 2005-07-18 12:00:24.000000000 +0200 ++++ sylpheed-2.0.0beta6/configure.in 2005-07-18 12:04:33.000000000 +0200 +@@ -202,7 +202,8 @@ + #include + ], [ return OPENSSL_VERSION_NUMBER; ], + [ AC_MSG_RESULT(yes) +- AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ], ++ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) ++ AC_DEFINE(USE_OPENSSL, 1, Define if you use OpenSSL to support SSL.) ], + [ AC_MSG_RESULT(no) + LIBS="$ac_save_LIBS" + ac_cv_enable_ssl=no ]) +@@ -211,6 +212,27 @@ + AC_MSG_RESULT(no) + fi + ++AC_ARG_ENABLE(gnutls, ++ [ --enable-gnutls Enable SSL support using GnuTLS [default=no]], ++ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no]) ++AC_MSG_CHECKING([whether to use GnuTLS]) ++if test $ac_cv_enable_gnutls = yes; then ++ AC_MSG_RESULT(yes) ++ AC_MSG_CHECKING([if GnuTLS is available]) ++ LIBS="$LIBS -lgnutls-openssl" ++ AC_TRY_LINK([ ++#include ++], [ return OPENSSL_VERSION_NUMBER; ], ++ [ AC_MSG_RESULT(yes) ++ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.) ++ AC_DEFINE(USE_GNUTLS, 1, Define if you use GnuTLS to support SSL.) ], ++ [ AC_MSG_RESULT(no) ++ LIBS="$ac_save_LIBS" ++ ac_cv_enable_gnutls=no ]) ++else ++ AC_MSG_RESULT(no) ++fi ++ + dnl Check for X-Face support + AC_ARG_ENABLE(compface, + [ --disable-compface Do not use compface (X-Face)], +@@ -350,6 +372,7 @@ + echo "JPilot : $ac_cv_enable_jpilot" + echo "LDAP : $ac_cv_enable_ldap" + echo "OpenSSL : $ac_cv_enable_ssl" ++echo "GnuTLS : $ac_cv_enable_gnutls" + echo "iconv : $am_cv_func_iconv" + echo "compface : $ac_cv_enable_compface" + echo "IPv6 : $ac_cv_enable_ipv6" +--- sylpheed-2.0.0beta6/src/ssl.h.old 2005-07-18 12:09:35.000000000 +0200 ++++ sylpheed-2.0.0beta6/src/ssl.h 2005-07-18 12:11:15.000000000 +0200 +@@ -27,11 +27,19 @@ + #if USE_SSL + + #include ++#if USE_OPENSSL + #include + #include + #include + #include + #include ++#else ++#if USE_GNUTLS ++#include ++#else ++#error Must select either GnuTLS or OpenSSL ++#endif ++#endif + + #include "socket.h" + diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb new file mode 100644 index 0000000000..4fab8e8bb8 --- /dev/null +++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb @@ -0,0 +1,30 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent" +DEPENDS = "gtk+ gpgme gnutls" +MAINTAINER = "Phil Blundell " +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \ + file://sylpheed-gnutls_2.0.0beta6.patch;patch=1" + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN}-doc += "${datadir}" + +EXTRA_OECONF = "--enable-gnutls" + +CFLAGS += "-D_GNU_SOURCE" + +do_configure_prepend() { + mkdir -p m4 +} + +inherit autotools + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ +} + -- cgit v1.2.3 From a6f5f86d2c6f1ed05ab471bbc719f5365efa1e7a Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Tue, 19 Jul 2005 12:06:54 +0000 Subject: added ggme 1.0.3 (required for sylpheed 2.0.0beta6) --- packages/gpgme/gpgme_1.0.3.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/gpgme/gpgme_1.0.3.bb diff --git a/packages/gpgme/gpgme_1.0.3.bb b/packages/gpgme/gpgme_1.0.3.bb new file mode 100644 index 0000000000..8292991a89 --- /dev/null +++ b/packages/gpgme/gpgme_1.0.3.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz" +PR = "r1" + +DEPENDS = "libgpg-error pth libassuan" + +EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" + +inherit autotools binconfig + +do_stage() { + autotools_stage_includes + + install -d ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR} + + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/ +} + -- cgit v1.2.3 From aa33ec8c089b6e0ed964f3f345e73c6fe9f4ba38 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 19 Jul 2005 14:44:26 +0000 Subject: Support for disabling irq debug messages - slugbug 109. This allows a simple local.conf change to re-enable the debug messages simply by setting CMDLINE_DEBUG to "" --- conf/distro/openslug.conf | 6 ++++++ packages/linux/nslu2-kernel.inc | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 33e655dcb6..4d4f9de837 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -32,6 +32,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz" +# CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided +# to enable/disable debugging in the distro. Here noirqdebug is used to +# remove the messages about unhandled interrupts - people debugging interrupt +# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) +CMDLINE_DEBUG = "noirqdebug" + # Filesystem support modules are listed in here for easy removal, # as is the lrzsz serial package and other kernel modules which are # not absolutely required for boot. diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc index 44f466ef49..f5d7135c88 100644 --- a/packages/linux/nslu2-kernel.inc +++ b/packages/linux/nslu2-kernel.inc @@ -211,10 +211,12 @@ inherit kernel ARCH = "arm" KERNEL_IMAGETYPE = "zImage" -# To specify the console set KERNEL_CONSOLE in the .bb -# file. The default is currently set in machine/nslu2.conf +# To specify the console set KERNEL_CONSOLE in the .bb file. +# CMDLINE_ROOT contains the boot options CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s" -CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" +# Add distro specific debug (or non-debug) options to this +CMDLINE_DEBUG ?= "" +CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as # required. Notice that this has to be done for each separately built -- cgit v1.2.3 From 01c623131aff75c317c40d4c3aaabcfb1e264d99 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 19 Jul 2005 15:06:44 +0000 Subject: Split the feeds into cross/native and ${DISTRO_VERSION}/unstable --- conf/distro/openslug.conf | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 33e655dcb6..4661d9186e 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -2,19 +2,20 @@ #@NAME: OpenSlug #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 -# Add to the user's feeds from local.conf (there may be none) -# not all available yet -#FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross" -#FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native" -FEED_URIS_append_linux += "oe##http://ipkg.nslu2-linux.org/feeds/openslug/oe" -# -# if you are very very brave: -#FEED_URIS_append_linux += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable" - DISTRO_NAME = "OpenSlug" DISTRO_VERSION = "2.2-beta" DISTRO_TYPE ?= "beta" +# Add to the user's feeds from local.conf (there may be none) +FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}" +FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}" + +# +# Uncomment the following to get the unstable feeds +#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable" +#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable" + + TARGET_FPU_local ?= "soft" TARGET_FPU := "${TARGET_FPU_local}" TARGET_OS_local ?= "linux" -- cgit v1.2.3