From 1fb3bb6d4025793ef378c2cbe39f1af16c86131f Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 24 Jan 2009 23:34:47 -0600 Subject: SlugOS: busybox-1.13 -- remove blkid and mod* utils from SlugOS defconfig --- packages/busybox/busybox-1.13.2/slugos/defconfig | 22 +++++++++++----------- packages/busybox/busybox_1.13.2.bb | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/busybox/busybox-1.13.2/slugos/defconfig b/packages/busybox/busybox-1.13.2/slugos/defconfig index dff07829af..67c7a98aae 100644 --- a/packages/busybox/busybox-1.13.2/slugos/defconfig +++ b/packages/busybox/busybox-1.13.2/slugos/defconfig @@ -427,13 +427,13 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_DEPMOD=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set # # Options common to multiple modutils @@ -444,14 +444,14 @@ CONFIG_DEPMOD=y # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_MODUTILS_ALIAS=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set # # Linux System Utilities # -CONFIG_BLKID=y +# CONFIG_BLKID is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FBSET is not set diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb index 1e4b09bae2..d316b16472 100644 --- a/packages/busybox/busybox_1.13.2.bb +++ b/packages/busybox/busybox_1.13.2.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r7" +PR = "r8" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ -- cgit v1.2.3 From b49e09758de7f29c049c12213347cb32fb64d7a4 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 25 Jan 2009 00:22:59 -0600 Subject: SlugOS: rename checkroot.sh to checkroot to avoid rcS "sourcing" SlugOS checkroot script redirects I/O which does not play well with the new "optimized" rcS behavior, which is to source any init scripts ending in "sh". --- .../initscripts/initscripts-1.0/slugos/checkroot | 177 +++++++++++++++++++++ .../initscripts-1.0/slugos/checkroot.sh | 177 --------------------- .../initscripts-1.0/slugos/domainname.sh | 2 +- .../initscripts/initscripts-1.0/slugos/mountall.sh | 2 +- packages/initscripts/initscripts-1.0/slugos/reboot | 2 +- .../initscripts/initscripts-1.0/slugos/umountfs | 2 +- .../initscripts-1.0/slugos/umountnfs.sh | 2 +- packages/initscripts/initscripts-slugos_1.0.bb | 16 +- 8 files changed, 195 insertions(+), 185 deletions(-) create mode 100644 packages/initscripts/initscripts-1.0/slugos/checkroot delete mode 100644 packages/initscripts/initscripts-1.0/slugos/checkroot.sh diff --git a/packages/initscripts/initscripts-1.0/slugos/checkroot b/packages/initscripts/initscripts-1.0/slugos/checkroot new file mode 100644 index 0000000000..31291cdc65 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/slugos/checkroot @@ -0,0 +1,177 @@ +#!/bin/sh +# checkroot.sh Check to root filesystem. +# +# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl +# + +. /etc/default/functions +. /etc/default/rcS + +# +# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned +# from this script *before anything else* with a timeout, like SCO does. +# +test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE + +# +# Ensure that bdflush (update) is running before any major I/O is +# performed (the following fsck is a good example of such activity :). +# +test -x /sbin/update && update + +# +# Read /etc/fstab. +# +exec 9>&0 &9 9>&- + +# +# Activate the swap device(s) in /etc/fstab. This needs to be done +# before fsck, since fsck can be quite memory-hungry. +# +# We don't test whether we're running a 2.[0123].x kernel and md +# since that's plain too old. + +if test "$DOSWAP" != no +then + swaps="$(blkid -t TYPE=swap -o device 2>/dev/null)" + if test -n "$swaps" + then + swapon $swaps 2>/dev/null + else + swapon -a 2> /dev/null + fi +fi + +# +# Check the root filesystem. +# +if test -f /fastboot || test "$ROOTFSCK" != yes +then + test "$ROOTFSCK" = yes && echo "Fast boot, no filesystem check" +elif test ! -x /sbin/fsck -a ! -x /usr/sbin/fsck +then + echo "/etc/init.d/checkroot.sh: no fsck" +else + leds disk-1 slow + # + # Ensure that root is quiescent and read-only before fsck'ing. + # + mount -n -o remount,ro / + if test $? = 0 + then + if test -f /forcefsck + then + force="-f" + else + force="" + fi + if test "$FSCKFIX" = yes + then + fix="-y" + else + fix="-a" + fi + spinner="-C" + case "$TERM" in + dumb|network|unknown|"") spinner="" ;; + esac + test "$VERBOSE" != no && echo "Checking root filesystem..." + fsck $spinner $force $fix / + # + # If there was a failure, drop into single-user mode. + # + # NOTE: "failure" is defined as exiting with a return code of + # 2 or larger. A return code of 1 indicates that filesystem + # errors were corrected but that the boot may proceed. + # + if test "$?" -gt 1 + then + # Surprise! Re-directing from a HERE document (as in + # "cat << EOF") won't work, because the root is read-only. + echo + echo "fsck failed. Please repair manually and reboot. Please note" + echo "that the root filesystem is currently mounted read-only. To" + echo "remount it read-write:" + echo + echo " # mount -n -o remount,rw /" + echo + echo "CONTROL-D will exit from this shell and REBOOT the system." + echo + leds system panic + leds beep -r 5 + # Start a single user shell on the console + if single_user_ok + then + sulogin -t 600 $CONSOLE + # if this exits with SIGALRM (which happens to be 142) the + # timeout happened, do not, then, reboot! + if test $? -ne 142 + then + reboot -f + else + echo "/etc/init.d/checkroot.sh: sulogin timeout, continuing boot" + fi + else + echo "/etc/init.d/checkroot.sh: fsck failed, continuing boot" + fi + fi + else + echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" + echo + fi + leds disk-1 off +fi + +# +# If the root filesystem was not marked as read-only in /etc/fstab, +# remount the rootfs rw but do not try to change mtab because it +# is on a ro fs until the remount succeeded. Then clean up old mtabs +# and finally write the new mtab. +# +mount -n -o remount,$rootopts / +if test "$rootmode" = rw +then + if test ! -L /etc/mtab + then + rm -f /etc/mtab~ /etc/nologin + : > /etc/mtab + fi + mount -f -o remount / + mount -f /proc + mount -f /sys + test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" +fi + +: exit 0 diff --git a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh deleted file mode 100644 index 3943f13427..0000000000 --- a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh +++ /dev/null @@ -1,177 +0,0 @@ -# -# checkroot.sh Check to root filesystem. -# -# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl -# - -. /etc/default/functions -. /etc/default/rcS - -# -# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned -# from this script *before anything else* with a timeout, like SCO does. -# -test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE - -# -# Ensure that bdflush (update) is running before any major I/O is -# performed (the following fsck is a good example of such activity :). -# -test -x /sbin/update && update - -# -# Read /etc/fstab. -# -exec 9>&0 &9 9>&- - -# -# Activate the swap device(s) in /etc/fstab. This needs to be done -# before fsck, since fsck can be quite memory-hungry. -# -# We don't test whether we're running a 2.[0123].x kernel and md -# since that's plain too old. - -if test "$DOSWAP" != no -then - swaps="$(blkid -t TYPE=swap -o device 2>/dev/null)" - if test -n "$swaps" - then - swapon $swaps 2>/dev/null - else - swapon -a 2> /dev/null - fi -fi - -# -# Check the root filesystem. -# -if test -f /fastboot || test "$ROOTFSCK" != yes -then - test "$ROOTFSCK" = yes && echo "Fast boot, no filesystem check" -elif test ! -x /sbin/fsck -a ! -x /usr/sbin/fsck -then - echo "/etc/init.d/checkroot.sh: no fsck" -else - leds disk-1 slow - # - # Ensure that root is quiescent and read-only before fsck'ing. - # - mount -n -o remount,ro / - if test $? = 0 - then - if test -f /forcefsck - then - force="-f" - else - force="" - fi - if test "$FSCKFIX" = yes - then - fix="-y" - else - fix="-a" - fi - spinner="-C" - case "$TERM" in - dumb|network|unknown|"") spinner="" ;; - esac - test "$VERBOSE" != no && echo "Checking root filesystem..." - fsck $spinner $force $fix / - # - # If there was a failure, drop into single-user mode. - # - # NOTE: "failure" is defined as exiting with a return code of - # 2 or larger. A return code of 1 indicates that filesystem - # errors were corrected but that the boot may proceed. - # - if test "$?" -gt 1 - then - # Surprise! Re-directing from a HERE document (as in - # "cat << EOF") won't work, because the root is read-only. - echo - echo "fsck failed. Please repair manually and reboot. Please note" - echo "that the root filesystem is currently mounted read-only. To" - echo "remount it read-write:" - echo - echo " # mount -n -o remount,rw /" - echo - echo "CONTROL-D will exit from this shell and REBOOT the system." - echo - leds system panic - leds beep -r 5 - # Start a single user shell on the console - if single_user_ok - then - sulogin -t 600 $CONSOLE - # if this exits with SIGALRM (which happens to be 142) the - # timeout happened, do not, then, reboot! - if test $? -ne 142 - then - reboot -f - else - echo "/etc/init.d/checkroot.sh: sulogin timeout, continuing boot" - fi - else - echo "/etc/init.d/checkroot.sh: fsck failed, continuing boot" - fi - fi - else - echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" - echo - fi - leds disk-1 off -fi - -# -# If the root filesystem was not marked as read-only in /etc/fstab, -# remount the rootfs rw but do not try to change mtab because it -# is on a ro fs until the remount succeeded. Then clean up old mtabs -# and finally write the new mtab. -# -mount -n -o remount,$rootopts / -if test "$rootmode" = rw -then - if test ! -L /etc/mtab - then - rm -f /etc/mtab~ /etc/nologin - : > /etc/mtab - fi - mount -f -o remount / - mount -f /proc - mount -f /sys - test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" -fi - -: exit 0 diff --git a/packages/initscripts/initscripts-1.0/slugos/domainname.sh b/packages/initscripts/initscripts-1.0/slugos/domainname.sh index 7113467d8c..e12de0e130 100644 --- a/packages/initscripts/initscripts-1.0/slugos/domainname.sh +++ b/packages/initscripts/initscripts-1.0/slugos/domainname.sh @@ -1,4 +1,4 @@ -# +#!/bin/sh # domainname.sh Set the domainname. # test -r /etc/defaultdomain && diff --git a/packages/initscripts/initscripts-1.0/slugos/mountall.sh b/packages/initscripts/initscripts-1.0/slugos/mountall.sh index 3a155d155b..1ae02df6a3 100644 --- a/packages/initscripts/initscripts-1.0/slugos/mountall.sh +++ b/packages/initscripts/initscripts-1.0/slugos/mountall.sh @@ -1,4 +1,4 @@ -# +#!/bin/sh # mountall.sh Mount all filesystems. # # Version: @(#)mountall.sh 2.83-2 01-Nov-2001 miquels@cistron.nl diff --git a/packages/initscripts/initscripts-1.0/slugos/reboot b/packages/initscripts/initscripts-1.0/slugos/reboot index cb0979f400..f98b87f033 100755 --- a/packages/initscripts/initscripts-1.0/slugos/reboot +++ b/packages/initscripts/initscripts-1.0/slugos/reboot @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # reboot Execute the reboot command. # diff --git a/packages/initscripts/initscripts-1.0/slugos/umountfs b/packages/initscripts/initscripts-1.0/slugos/umountfs index d6f432dbda..5580d7bb47 100644 --- a/packages/initscripts/initscripts-1.0/slugos/umountfs +++ b/packages/initscripts/initscripts-1.0/slugos/umountfs @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # umountfs Turn off swap and unmount all local filesystems. # diff --git a/packages/initscripts/initscripts-1.0/slugos/umountnfs.sh b/packages/initscripts/initscripts-1.0/slugos/umountnfs.sh index 994a919225..6ff83e50d7 100644 --- a/packages/initscripts/initscripts-1.0/slugos/umountnfs.sh +++ b/packages/initscripts/initscripts-1.0/slugos/umountnfs.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # umountnfs.sh Unmount all network filesystems. # diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 41b1e97d9d..ba1b97e024 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -16,7 +16,7 @@ RDEPENDS = "" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.16" +PR := "${PR}.17" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" @@ -26,18 +26,28 @@ SRC_URI += "file://alignment.sh" SRC_URI += "file://domainname.sh" SRC_URI += "file://devices.patch;patch=1" SRC_URI += "file://bootclean.sh" +SRC_URI += "file://checkroot" -# Without this it is not possible to patch checkroot.sh +# Without this it is not possible to patch checkroot S = "${WORKDIR}" do_install_append() { # the image build command now installs this for slugos rm ${D}${sysconfdir}/device_table + # Ugly - we need to get rid of the checkroot.sh + # that was installed by initscript-1.0.bb; the new + # rcS script will "source" files that end in .sh, + # and that messes up our checkroot.sh script (due + # to redirection issues. We need to use only our + # checkroot, without the ".sh" suffix. + rm -f ${D}${sysconfdir}/init.d/checkroot.sh + # slugos specific scripts install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/domainname.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/bootclean.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/checkroot ${D}${sysconfdir}/init.d # Remove the do install links (this detects a change to the # initscripts .bb file - it will cause a build failure here.) @@ -104,7 +114,7 @@ do_install_append() { # busybox hwclock.sh (slugos-init) starts here (08) # slugos-init umountinitrd runs here (09) - update-rc.d -r ${D} checkroot.sh start 10 S . + update-rc.d -r ${D} checkroot start 10 S . # slugos buffer syslog starts here (11) # sysconfsetup runs at S 12 # modutils.sh runs at S 20 -- cgit v1.2.3 From d97d342c2d3556b02ac89e3b3f3692ef19be954a Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 25 Jan 2009 00:43:06 -0600 Subject: SlugOS: add modprobe.d/usb - ensure usb modules are loaded in correct order Avoid kernel warning message. --- packages/slugos-init/files/usb | 2 ++ packages/slugos-init/slugos-init_5.0.bb | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 packages/slugos-init/files/usb diff --git a/packages/slugos-init/files/usb b/packages/slugos-init/files/usb new file mode 100644 index 0000000000..b641113137 --- /dev/null +++ b/packages/slugos-init/files/usb @@ -0,0 +1,2 @@ +install uhci-hcd /sbin/modprobe ehci-hcd ; /sbin/modprobe -i uhci-hcd +install ohci-hcd /sbin/modprobe ehci-hcd ; /sbin/modprobe -i ohci-hcd diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index 822e252dee..8d15d94f4d 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r6" +PR = "r7" SRC_URI = "file://boot/flash \ file://boot/disk \ @@ -60,6 +60,7 @@ do_install() { ${D}${sysconfdir}/default \ ${D}${sysconfdir}/init.d \ ${D}${sysconfdir}/modutils \ + ${D}${sysconfdir}/modprobe.d \ ${D}${sysconfdir}/udev \ ${D}${sbindir} \ ${D}${base_sbindir} \ @@ -108,6 +109,9 @@ do_install() { # Developer-only tools, tucked away install -m 0755 reflash ${D}${sysconfdir}/default + # Modprobe configuration files + install -m 0644 usb ${D}${sysconfdir}/modprobe.d + set +ex } -- cgit v1.2.3 From 903d61b47cdd10db5f3aca3f7604ad42467fc3c5 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 25 Jan 2009 00:49:33 -0600 Subject: SlugOS: slugos-init - add modprobe.d/usb to the files list. --- packages/slugos-init/slugos-init_5.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index 8d15d94f4d..e7a45a94aa 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r7" +PR = "r8" SRC_URI = "file://boot/flash \ file://boot/disk \ @@ -29,6 +29,7 @@ SRC_URI = "file://boot/flash \ file://leds \ file://turnup \ file://reflash \ + file://usb \ " SBINPROGS = "" -- cgit v1.2.3 From 2c71c0e53c4339fffa9cfa24bc21faf7e5ec02ad Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 25 Jan 2009 09:21:21 +0100 Subject: angstrom feed builder: add cwiid --- contrib/angstrom/build-feeds.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 79cdb6917c..ab252db53d 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -86,6 +86,7 @@ do claws-mail \ contacts \ cvs \ + cwiid \ dates \ distcc \ dsniff \ -- cgit v1.2.3 From d66d7173a3021509fd56f93c2fec78d6b4e25837 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 25 Jan 2009 09:50:10 +0100 Subject: angstrom feed sorter: add more machines --- contrib/angstrom/sort.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 613e9bf99f..90d5dda9fd 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -48,7 +48,7 @@ case "$arch" in "armv4t") machines="ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") - machines="dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;; + machines="n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6-novfp") @@ -77,7 +77,7 @@ case "$arch" in "ppc405") machines="dht-walnut" ;; "ppc603e") - machines="efika" ;; + machines="lsppchd lsppchg efika n1200" ;; "ppce300c3") machines="mpc8313e-rdb mpc8315e-rdb" ;; "sparc") -- cgit v1.2.3 From 6d2868f7db970684c2df99d6574fd25dd00dae29 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 25 Jan 2009 09:51:46 +0100 Subject: gnash: package browser plugin --- packages/gnash/gnash.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index f4c7c1338d..29308b6c0a 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -4,7 +4,7 @@ LICENSE = "GPL-2" DEPENDS = "libtool gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ " @@ -23,12 +23,17 @@ EXTRA_OECONF = "--enable-gui=gtk \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-mad', d)} \ --enable-cairo \ --enable-plugin \ + --enable-plugins \ + --enable-npapi \ + --with-npapi-plugindir=${libdir}/mozilla/plugins \ + --enable-mit-shm \ --disable-cygnal \ --with-top-level=${STAGING_DIR_HOST}/usr \ " -PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " +PACKAGES =+ " gnash-browser-plugin libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " +FILES_gnash-browser-plugin= "${libdir}/mozilla/plugins/*" FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" FILES_libgnashbackend = "${libdir}/gnash/libgnashbackend-${PV}.so" FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" -- cgit v1.2.3 From 62f71fd1fae011ae065d3033401a1dcb5fcad54e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 25 Jan 2009 10:08:06 +0100 Subject: iscsi-target: rdepending on modules is illegal, move then to rrecommends --- packages/iscsi-target/iscsi-target_0.4.17.bb | 4 ++-- packages/iscsi-target/iscsi-target_svn.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/iscsi-target/iscsi-target_0.4.17.bb b/packages/iscsi-target/iscsi-target_0.4.17.bb index 8acb945a71..deb09022d4 100644 --- a/packages/iscsi-target/iscsi-target_0.4.17.bb +++ b/packages/iscsi-target/iscsi-target_0.4.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux" HOMEPAGE = "http://iscsitarget.sourceforge.net/" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \ file://libs.patch;patch=1 \ @@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \ S = "${WORKDIR}/iscsitarget-${PV}" DEPENDS = "openssl" -RDEPENDS = "kernel-module-crc32c kernel-module-libcrc32c" +RRECOMMENDS = "kernel-module-crc32c kernel-module-libcrc32c" inherit module diff --git a/packages/iscsi-target/iscsi-target_svn.bb b/packages/iscsi-target/iscsi-target_svn.bb index 92d3c376d5..774674002e 100644 --- a/packages/iscsi-target/iscsi-target_svn.bb +++ b/packages/iscsi-target/iscsi-target_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux" HOMEPAGE = "http://iscsitarget.sourceforge.net/" LICENSE = "GPL" -PR = "r12" +PR = "r13" DEFAULT_PREFERENCE = "-1" @@ -12,7 +12,7 @@ SRC_URI = "svn://svn.berlios.de/iscsitarget/;module=trunk;rev=HEAD \ " DEPENDS = " openssl" -RDEPENDS = "kernel-module-crc32c kernel-module-libcrc32c" +RRECOMMENDS = "kernel-module-crc32c kernel-module-libcrc32c" S = "${WORKDIR}/trunk" -- cgit v1.2.3