diff options
| author | g2@giantshoulder.com <g2@giantshoulder.com> | 2005-03-23 19:15:11 +0000 |
|---|---|---|
| committer | g2@giantshoulder.com <g2@giantshoulder.com> | 2005-03-23 19:15:11 +0000 |
| commit | 29d39c66930d2e04f6a52b9468c236b72faee073 (patch) | |
| tree | dc96ba4ce7a343bccb57e1d6a1e5d01685490029 | |
| parent | 3bd321a6be3c38e6d0de401d61b156d28c4eec99 (diff) | |
Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded
into giantshoulder.com:/home/tom/dev/openslug/openembedded
2005/03/23 08:41:50-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 16:34:02+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded
2005/03/23 16:32:05+00:00 rpsys.net!RP
openzaurus-2.6: fix typo
2005/03/23 17:31:58+01:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded
2005/03/23 17:31:35+01:00 local!hrw
updated kdepimpi to 2.0.20
2005/03/23 07:41:31-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 16:38:17+01:00 zeckescompany.nl!alwin
changed package-dep for meta-opie
2005/03/24 00:32:02+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/24 00:31:35+10:30 (none)!rwhitby
Made Unslung *not* create ramdisk for /var and /dev when you've unslung to an external disk
2005/03/23 05:41:22-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/24 00:15:58+10:30 (none)!rwhitby
Fixed the unslung patch for rc.1
2005/03/24 00:06:41+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/24 00:06:21+10:30 (none)!rwhitby
Unslung 4.7-alpha, with support for external disks on sda1, sda2, sdb1, sdb2.
2005/03/23 14:26:04+01:00 uni-frankfurt.de!mickeyl
rename wlan-ng-modules package per upstream changes
2005/03/23 14:23:31+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/23 14:23:20+01:00 uni-frankfurt.de!mickeyl
add remind, a console PIM application. in nonworking, because it needs a gcc3.x patch
2005/03/23 04:41:30-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 13:34:56+01:00 mn-solutions.de!schurig
Various twiddles for MNCI "Ramses":
qmake-native: remove my weird attempt to get things right, it was very wrong :-)
gdb: add REPENDS on libthread-db1 to allow debugging of threaded Qt/E 3.x apps
kernel: add bluez-modules
sysvinit: make startup even faster by removing access to /proc/progress
2005/03/23 03:41:24-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 22:12:18+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/23 22:11:52+10:30 (none)!rwhitby
Added lots of modules for traffic shaping and other various things to OpenSlug kernel
2005/03/23 12:14:09+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded
2005/03/23 12:13:44+01:00 (none)!br1
fixed hostapd 0.3.7 and added wpa_supplicant 0.3.8
2005/03/23 11:41:30+01:00 uni-frankfurt.de!mickeyl
remove hostap-daemon from nonworking. hey folks, please look if not already there is a nonworking version before you add a new one
2005/03/23 02:41:23-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 11:38:09+01:00 uni-frankfurt.de!mickeyl
opie-collections: add datebook plugins to standard opie image
2005/03/23 11:35:44+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/23 11:33:22+01:00 uni-frankfurt.de!mickeyl
add newer gpsd versions and a fixed start/stop script
2005/03/23 11:31:34+01:00 uni-frankfurt.de!mickeyl
opie packaging changes in meta-opie and opie-login
2005/03/23 11:06:47+01:00 (none)!br1
added packages "ser" and "mystun" contributed by Sven-Ola Tuecke
2005/03/23 11:02:05+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded
2005/03/22 17:41:23-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 01:26:50+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded
2005/03/23 01:26:05+00:00 (none)!cwiiis
Use the sourceforge source for freetype, as it seems to be the primary download location now.
2005/03/23 01:24:53+00:00 (none)!cwiiis
Small gpe-related updates to openzaurus-3.5.3.conf.
2005/03/23 01:23:49+00:00 (none)!cwiiis
Correct XLIBS_MIRROR
2005/03/22 07:41:25-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/22 16:31:48+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/22 16:31:38+01:00 uni-frankfurt.de!mickeyl
libqte2: set package arch to machine arch since we supply machine specific patches and flags
2005/03/22 15:11:11+00:00 (none)!cwiiis
Use ?= instead of = in conf/distro/preferred-gpe-versions.inc, so as not to override user-specified settings
2005/03/22 22:57:38+10:30 (none)!rwhitby
Bumped the Openslug kernel PR
2005/03/22 22:53:49+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/22 22:53:07+10:30 (none)!rwhitby
Changed CONFIG_ATALK from =y to =m in Unslung kernel
2005/03/22 03:41:21-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/22 12:30:28+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/22 12:30:12+01:00 uni-frankfurt.de!mickeyl
include tune-xscale in the pxa machines. root file systems can be built with all optimizations since they are machine specific anyway. the unified feed though needs to be built using a tune-strongarm based machine configuration
2005/03/22 12:28:44+01:00 local!hrw
added qpf-gentium font to meta-opie
2005/03/22 12:27:20+01:00 local!hrw
updated qpf-dejavufonts to 1.8
added all rotations
2005/03/22 12:26:15+01:00 local!hrw
added all rotations to qpf-hunkyfonts
2005/03/22 12:09:08+01:00 uni-frankfurt.de!mickeyl
add qpf-gentium, a free font with lots of characters. thanks hrw for converting.
2005/03/22 10:39:58+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/22 00:41:26-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/22 07:43:44+00:00 reciva.com!pb
change "h2200_linear" to "linear_h2200".
Reported by Matt Reimer.
2005/03/21 17:41:26-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/22 01:56:50+01:00 dyndns.org!reenoo
libglade: update to 2.4.2 which fixes improper use of the toolbar API. make no-xml2.patch apply against 2.4.2.
2005/03/22 00:59:21+01:00 uni-frankfurt.de!mickeyl
split tosa machine configuration into generic, 2.4, 2.6 parts
2005/03/22 00:54:55+01:00 uni-frankfurt.de!mickeyl
add a version of orinoco-0.13e that compiles against kernel 2.6 and choose that version for the clamshells and the poodle
2005/03/18 16:13:17+01:00 (none)!br1
added madwifi BSD branch build
2005/03/18 16:12:01+01:00 (none)!br1
added hostap-daemon 0.3.7
BKrev: 4241c03fA7V8WMbGM7hnEqx17eXRkw
91 files changed, 508 insertions, 420 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 2b99e29b0a..ff3c6348e2 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -288,7 +288,7 @@ GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" SOURCEFORGE_MIRROR = "http://aleron.dl.sourceforge.net/sourceforge" GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source" -XLIBS_MIRROR = "http://freedesktop.org/~xlibs/release" +XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs" diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf index 3b7aa1994e..f051f7b5ad 100644 --- a/conf/distro/openzaurus-3.5.3.conf +++ b/conf/distro/openzaurus-3.5.3.conf @@ -47,9 +47,8 @@ include conf/distro/preferred-opie-versions.inc # GPE # -CVSDATE_xserver-kdrive = "20050208" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" include conf/distro/preferred-gpe-versions.inc diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc index 0851c2e696..f33302d741 100644 --- a/conf/distro/preferred-gpe-versions.inc +++ b/conf/distro/preferred-gpe-versions.inc @@ -6,74 +6,74 @@ #CVSDATE_xserver-kdrive=20050207 #specify versions, as the header says :) -PREFERRED_VERSION_libmatchbox = "1.6" -PREFERRED_VERSION_matchbox = "0.9.1" -PREFERRED_VERSION_matchbox-common = "0.9.1" -PREFERRED_VERSION_matchbox-desktop = "0.9.1" -PREFERRED_VERSION_matchbox-wm = "0.9.3" -PREFERRED_VERSION_matchbox-panel = "0.9.1" -PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6" -PREFERRED_VERSION_gtk+ = "2.6.3" -PREFERRED_VERSION_libgpewidget = "0.97" -PREFERRED_VERSION_libgpepimc = "0.4" -PREFERRED_VERSION_libgpevtype = "0.11" -PREFERRED_VERSION_libschedule = "0.14" -PREFERRED_VERSION_gpe-icons = "0.24" -PREFERRED_VERSION_libgsm = "1.0.10" -#PREFERRED_VERSION_diet-x11 = "6.2.1" -PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1" -PREFERRED_VERSION_rxvt-unicode = "5.3" -PREFERRED_VERSION_gtk2-theme-angelistic = "0.3" -PREFERRED_VERSION_xst = "0.14" -PREFERRED_VERSION_xextensions = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost = "0.0cvs20040413" -PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_gpe-login = "0.76" -PREFERRED_VERSION_gpe-session-scripts = "0.62" -PREFERRED_VERSION_gpe-soundserver = "0.4-1" -PREFERRED_VERSION_gpe-todo = "0.50" -PREFERRED_VERSION_gpe-calendar = "0.61" -PREFERRED_VERSION_gpe-sketchbox = "0.2.8" -PREFERRED_VERSION_gpe-contacts = "0.36" -PREFERRED_VERSION_gpe-today = "0.08" -PREFERRED_VERSION_matchbox-panel-manager = "0.1" -PREFERRED_VERSION_dbus = "0.23" -PREFERRED_VERSION_gpe-bluetooth = "0.38" -PREFERRED_VERSION_gpe-su = "0.18" -PREFERRED_VERSION_gpe-conf = "0.1.22" -PREFERRED_VERSION_gpe-clock = "0.20" -PREFERRED_VERSION_gpe-mininet = "0.5" -PREFERRED_VERSION_gpe-mixer = "0.40" -PREFERRED_VERSION_gpe-shield = "0.7" -PREFERRED_VERSION_gpe-wlancfg = "0.2.6" -PREFERRED_VERSION_gpe-taskmanager = "0.17" -PREFERRED_VERSION_keylaunch = "2.0.7" -PREFERRED_VERSION_minilite = "0.47" -PREFERRED_VERSION_xmonobut = "0.4" -PREFERRED_VERSION_gpe-edit = "0.28" -PREFERRED_VERSION_gpe-gallery = "0.95" -PREFERRED_VERSION_gpe-calculator = "0.2" -PREFERRED_VERSION_gpe-package = "0.2" -PREFERRED_VERSION_gpe-soundbite = "1.0.5" -PREFERRED_VERSION_gpe-terminal = "1.1" -PREFERRED_VERSION_gpe-watch = "0.10" -PREFERRED_VERSION_gpe-what = "0.33" -PREFERRED_VERSION_gpe-filemanager = "0.20" -PREFERRED_VERSION_gpe-go = "0.05" -PREFERRED_VERSION_gpe-irc = "0.07" -PREFERRED_VERSION_gpe-lights = "0.13" -#PREFERRED_VERSION_gpe-nmf = "0.19" -PREFERRED_VERSION_gpe-othello = "0.2-1" -PREFERRED_VERSION_gpe-plucker = "0.2" -PREFERRED_VERSION_gpe-tetris = "0.6-2" -PREFERRED_VERSION_gsoko = "0.4.2-gpe6" -PREFERRED_VERSION_xdemineur = "2.1.1" -PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1" -PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_dillo2 = "0.6.6" -PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}" -PREFERRED_VERSION_linphone-hh = "0.12.2.hh1" -PREFERRED_VERSION_linphone = "0.12.2" -PREFERRED_VERSION_firefox = "1.0" +PREFERRED_VERSION_libmatchbox ?= "1.6" +PREFERRED_VERSION_matchbox ?= "0.9.1" +PREFERRED_VERSION_matchbox-common ?= "0.9.1" +PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" +PREFERRED_VERSION_matchbox-wm ?= "0.9.3" +PREFERRED_VERSION_matchbox-panel ?= "0.9.1" +PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" +PREFERRED_VERSION_gtk+ ?= "2.6.3" +PREFERRED_VERSION_libgpewidget ?= "0.97" +PREFERRED_VERSION_libgpepimc ?= "0.4" +PREFERRED_VERSION_libgpevtype ?= "0.11" +PREFERRED_VERSION_libschedule ?= "0.14" +PREFERRED_VERSION_gpe-icons ?= "0.24" +PREFERRED_VERSION_libgsm ?= "1.0.10" +#PREFERRED_VERSION_diet-x11 ?= "6.2.1" +PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" +PREFERRED_VERSION_rxvt-unicode ?= "5.3" +PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" +PREFERRED_VERSION_xst ?= "0.14" +PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xhost ?= "0.0cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_gpe-login ?= "0.76" +PREFERRED_VERSION_gpe-session-scripts ?= "0.62" +PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" +PREFERRED_VERSION_gpe-todo ?= "0.50" +PREFERRED_VERSION_gpe-calendar ?= "0.61" +PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" +PREFERRED_VERSION_gpe-contacts ?= "0.36" +PREFERRED_VERSION_gpe-today ?= "0.08" +PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" +PREFERRED_VERSION_dbus ?= "0.23" +PREFERRED_VERSION_gpe-bluetooth ?= "0.38" +PREFERRED_VERSION_gpe-su ?= "0.18" +PREFERRED_VERSION_gpe-conf ?= "0.1.22" +PREFERRED_VERSION_gpe-clock ?= "0.20" +PREFERRED_VERSION_gpe-mininet ?= "0.5" +PREFERRED_VERSION_gpe-mixer ?= "0.40" +PREFERRED_VERSION_gpe-shield ?= "0.7" +PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" +PREFERRED_VERSION_gpe-taskmanager ?= "0.17" +PREFERRED_VERSION_keylaunch ?= "2.0.7" +PREFERRED_VERSION_minilite ?= "0.47" +PREFERRED_VERSION_xmonobut ?= "0.4" +PREFERRED_VERSION_gpe-edit ?= "0.28" +PREFERRED_VERSION_gpe-gallery ?= "0.95" +PREFERRED_VERSION_gpe-calculator ?= "0.2" +PREFERRED_VERSION_gpe-package ?= "0.2" +PREFERRED_VERSION_gpe-soundbite ?= "1.0.5" +PREFERRED_VERSION_gpe-terminal ?= "1.1" +PREFERRED_VERSION_gpe-watch ?= "0.10" +PREFERRED_VERSION_gpe-what ?= "0.33" +PREFERRED_VERSION_gpe-filemanager ?= "0.20" +PREFERRED_VERSION_gpe-go ?= "0.05" +PREFERRED_VERSION_gpe-irc ?= "0.07" +PREFERRED_VERSION_gpe-lights ?= "0.13" +#PREFERRED_VERSION_gpe-nmf ?= "0.19" +PREFERRED_VERSION_gpe-othello ?= "0.2-1" +PREFERRED_VERSION_gpe-plucker ?= "0.2" +PREFERRED_VERSION_gpe-tetris ?= "0.6-2" +PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" +PREFERRED_VERSION_xdemineur ?= "2.1.1" +PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" +PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_dillo2 ?= "0.6.6" +PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" +PREFERRED_VERSION_linphone ?= "0.12.2" +PREFERRED_VERSION_firefox ?= "1.0" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index df20c0647a..35f1de8ec4 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -2,10 +2,12 @@ #@NAME: Unslung #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 -FEED_URIS_unslung = "unslung##http://ipkg.nslu2-linux.org/feeds/unslung/unstable" +FEED_URIS_cross = "cross##http://ipkg.nslu2-linux.org/feeds/unslung/cross" +FEED_URIS_native = "native##http://ipkg.nslu2-linux.org/feeds/unslung/native" +FEED_URIS_oe = "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe" DISTRO_NAME = "Unslung" -DISTRO_VERSION = "4.5-alpha" +DISTRO_VERSION = "4.7-alpha" DISTRO_TYPE = "beta" TARGET_FPU = "soft" diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf index e69de29bb2..72a751d19e 100644 --- a/conf/machine/poodle-2.6.conf +++ b/conf/machine/poodle-2.6.conf @@ -0,0 +1,6 @@ +PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +PREFERRED_VERSION_orinoco-modules = "0.13e-26" + +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" + diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 458ee554bd..3bd9f5f076 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -14,8 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" include conf/machine/handheld-common.conf -# not using tune-xscale.conf so as to retain backwards compatibility -include conf/machine/tune-strongarm.conf + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/packages/kdepimpi/kdepimpi_2.0.17.bb b/conf/machine/tosa-2.4.conf index e69de29bb2..e69de29bb2 100644 --- a/packages/kdepimpi/kdepimpi_2.0.17.bb +++ b/conf/machine/tosa-2.4.conf diff --git a/packages/nonworking/hostap/hostap-daemon_0.3.7.bb b/conf/machine/tosa-2.6.conf index e69de29bb2..e69de29bb2 100644 --- a/packages/nonworking/hostap/hostap-daemon_0.3.7.bb +++ b/conf/machine/tosa-2.6.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index be495925c1..f742bed742 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -4,24 +4,9 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" -BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules 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 \ - kernel-module-pxa-bi kernel-module-registers \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel-module-usb-storage \ - kernel hostap-modules-cs orinoco-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre \ - kernel-module-irnet kernel-module-ipip kernel-module-usbcore \ - kernel-module-usbdcore kernel-module-usbdmonitor" - -RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" + +KERNEL_VERSION ?= "2.4" +include conf/machine/tosa-${KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" @@ -31,7 +16,8 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" include conf/machine/handheld-common.conf -# not using tune-xscale.conf so as to retain backwards compatibility -include conf/machine/tune-strongarm.conf + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 530d12af0b..e408c5c86e 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -1,6 +1,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -PREFERRED_VERSION_orinoco-modules = "cvs" +PREFERRED_VERSION_orinoco-modules = "0.13e-26" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin" diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf index 9246d45197..e0b8d31349 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/zaurus-clamshell.conf @@ -16,7 +16,8 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed" GPE_EXTRA_INSTALL += "gaim sylpheed" include conf/machine/handheld-common.conf -# not using tune-xscale.conf so as to retain backwards compatibility -include conf/machine/tune-strongarm.conf + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/packages/freetype/freetype-native_2.1.7.bb b/packages/freetype/freetype-native_2.1.7.bb index dbebbef1ab..673cdb0d02 100644 --- a/packages/freetype/freetype-native_2.1.7.bb +++ b/packages/freetype/freetype-native_2.1.7.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Freetype font rendering library" PR = "r1" -SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://configure.patch;patch=1" inherit autotools pkgconfig native binconfig diff --git a/packages/freetype/freetype-native_2.1.8.bb b/packages/freetype/freetype-native_2.1.8.bb index b0bdb0fb38..ba8b59fe4d 100644 --- a/packages/freetype/freetype-native_2.1.8.bb +++ b/packages/freetype/freetype-native_2.1.8.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Freetype font rendering library" PR = "r1" -SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://${FILESDIR}/configure.patch;patch=1" inherit autotools pkgconfig native binconfig diff --git a/packages/freetype/freetype_2.1.7.bb b/packages/freetype/freetype_2.1.7.bb index 107c3dc142..751a4ae51c 100644 --- a/packages/freetype/freetype_2.1.7.bb +++ b/packages/freetype/freetype_2.1.7.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Freetype font rendering library" PR = "r1" -SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetpye-${PV}.tar.bz2 \ file://configure.patch;patch=1" FILES_${PN} = "${libdir}/lib*.so.*" diff --git a/packages/freetype/freetype_2.1.8.bb b/packages/freetype/freetype_2.1.8.bb index f5b0dde110..49f71551dd 100644 --- a/packages/freetype/freetype_2.1.8.bb +++ b/packages/freetype/freetype_2.1.8.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Freetype font rendering library" PR = "r1" -SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://configure.patch;patch=1" FILES_${PN} = "${libdir}/lib*.so.*" diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb index e69de29bb2..7922558cc4 100644 --- a/packages/gdb/gdb_6.3.bb +++ b/packages/gdb/gdb_6.3.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "gdb - GNU debugger" +HOMEPAGE = "http://www.gnu.org/software/gdb/" +LICENSE="GPL" +SECTION = "devel" +PRIORITY = "optional" +MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>" +DEPENDS = "ncurses readline" +RDEPENDS_ramses = "libthread-db1" + +PACKAGES =+ 'gdbserver ' +FILES_gdbserver = '${bindir}/gdbserver' + +inherit autotools gettext + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ + file://uclibc.patch;patch=1 \ + file://gdbserver-cflags-last.diff;patch=1;pnum=0" + +LDFLAGS_append = " -s" +export CC_FOR_BUILD = "${BUILD_CC}" +export CXX_FOR_BUILD = "${BUILD_CXX}" +export CPP_FOR_BUILD = "${BUILD_CPP}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" +export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" +export CFLAGS_append=" -L${STAGING_LIBDIR}" +EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" + +EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ + --with-curses --disable-multilib --with-readline --disable-sim \ + --program-prefix=''" + +S = "${WORKDIR}/gdb-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + CPPFLAGS="" oe_runconf +} + +do_install () { + make -C bfd/doc chew LDFLAGS= CFLAGS=-O2 + oe_runmake DESTDIR='${D}' install + install -d ${D}${bindir} + install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} +} diff --git a/packages/gpsd/files/gpsd b/packages/gpsd/files/gpsd new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpsd/files/gpsd diff --git a/packages/gpsd/gpsd_2.15.bb b/packages/gpsd/gpsd_2.15.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpsd/gpsd_2.15.bb diff --git a/packages/gpsd/gpsd_2.16.bb b/packages/gpsd/gpsd_2.16.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpsd/gpsd_2.16.bb diff --git a/packages/gpsd/gpsd_2.17.bb b/packages/gpsd/gpsd_2.17.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpsd/gpsd_2.17.bb diff --git a/packages/hostap/hostap-daemon-0.3.7/defconfig b/packages/hostap/hostap-daemon-0.3.7/defconfig new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.3.7/defconfig diff --git a/packages/hostap/hostap-daemon-0.3.7/init b/packages/hostap/hostap-daemon-0.3.7/init new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.3.7/init diff --git a/packages/hostap/hostap-daemon-0.3.7/madwifi-bsd-fix.diff b/packages/hostap/hostap-daemon-0.3.7/madwifi-bsd-fix.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.3.7/madwifi-bsd-fix.diff diff --git a/packages/hostap/hostap-daemon-0.3.7/makefile-cross.diff b/packages/hostap/hostap-daemon-0.3.7/makefile-cross.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.3.7/makefile-cross.diff diff --git a/packages/hostap/hostap-daemon-0.3.7/mtx-1/defconfig b/packages/hostap/hostap-daemon-0.3.7/mtx-1/defconfig new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.3.7/mtx-1/defconfig diff --git a/packages/hostap/hostap-daemon_0.3.7.bb b/packages/hostap/hostap-daemon_0.3.7.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hostap/hostap-daemon_0.3.7.bb diff --git a/packages/kdepimpi/kdepimpi_2.0.20.bb b/packages/kdepimpi/kdepimpi_2.0.20.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/kdepimpi/kdepimpi_2.0.20.bb diff --git a/packages/libglade/libglade-2.4.2/glade-cruft.patch b/packages/libglade/libglade-2.4.2/glade-cruft.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libglade/libglade-2.4.2/glade-cruft.patch diff --git a/packages/libglade/libglade-2.4.2/no-xml2.patch b/packages/libglade/libglade-2.4.2/no-xml2.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libglade/libglade-2.4.2/no-xml2.patch diff --git a/packages/libglade/libglade_2.4.2.bb b/packages/libglade/libglade_2.4.2.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libglade/libglade_2.4.2.bb diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index 2ea9f77225..3079e5e8c7 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r10" +PR = "r11" DOSRC = "http://www.do13.in-berlin.de/openzaurus" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -73,7 +73,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ SRC_URI_append_collie = " ${RPSRC}/jl1/collie_keymap.patch;patch=1 " SRC_URI_append_poodle = " ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \ - ${RPSRC}/rpextra_poodle-r0.patch;patch=1 " " + ${RPSRC}/rpextra_poodle-r0.patch;patch=1 " SRC_URI_append_tosa = " ${DOSRC}/nand-readid-r0.patch;patch=1 \ ${DOSRC}/ac97-r1.patch;patch=1 \ ${DOSRC}/tosa-detection-r0.patch;patch=1 \ diff --git a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch index fd1ba4db48..8299c9d3dc 100644 --- a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch +++ b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch @@ -1783,7 +1783,7 @@ --- /dev/null +++ linux-2.4.21/arch/arm/def-configs/ramses -@@ -0,0 +1,1152 @@ +@@ -0,0 +1,1159 @@ +# +# Automatically generated by make menuconfig: don't edit +# @@ -2910,7 +2910,14 @@ +# +# Bluetooth support +# -+# CONFIG_BLUEZ is not set ++CONFIG_BLUEZ=y ++CONFIG_BLUEZ_L2CAP=m ++CONFIG_BLUEZ_SCO=m ++CONFIG_BLUEZ_RFCOMM=m ++CONFIG_BLUEZ_RFCOMM_TTY=y ++CONFIG_BLUEZ_BNEP=m ++# CONFIG_BLUEZ_BNEP_MC_FILTER is not set ++# CONFIG_BLUEZ_BNEP_PROTO_FILTER is not set + +# +# Kernel hacking diff --git a/packages/linux/unslung-kernel-2.3r25/defconfig b/packages/linux/unslung-kernel-2.3r25/defconfig index 5691a8b41b..b55fe0ab6c 100644 --- a/packages/linux/unslung-kernel-2.3r25/defconfig +++ b/packages/linux/unslung-kernel-2.3r25/defconfig @@ -390,7 +390,33 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IP_NF_CONNTRACK is not set # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +CONFIG_IP_NF_MATCH_PKTTYPE=m +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +CONFIG_IP_NF_MATCH_UNCLEAN=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_MIRROR=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m # CONFIG_IP_NF_ARPTABLES is not set # CONFIG_IP_NF_COMPAT_IPCHAINS is not set # CONFIG_IP_NF_COMPAT_IPFWADM is not set @@ -403,7 +429,7 @@ CONFIG_IP_PNP_BOOTP=y # # # CONFIG_IPX is not set -CONFIG_ATALK=y +CONFIG_ATALK=m # # Appletalk devices @@ -428,7 +454,25 @@ CONFIG_IPDDP_DECAP=y # # QoS and/or fair queueing # -# CONFIG_NET_SCHED is not set +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_CSZ=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_INGRESS=m +# CONFIG_NET_QOS is not set +CONFIG_NET_CLS=y +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m # CONFIG_IPSEC is not set # @@ -448,8 +492,8 @@ CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_ETHERTAP is not set +CONFIG_TUN=m +CONFIG_ETHERTAP=m # # Ethernet (10 or 100Mbit) @@ -583,9 +627,11 @@ CONFIG_SCSI=y # CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 -# CONFIG_CHR_DEV_ST is not set +CONFIG_CHR_DEV_ST=m # CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 # CONFIG_CHR_DEV_SG is not set # @@ -1034,7 +1080,7 @@ CONFIG_USB_PRINTER=m # # CONFIG_USB_DC2XX is not set # CONFIG_USB_MDC800 is not set -# CONFIG_USB_SCANNER is not set +CONFIG_USB_SCANNER=m # CONFIG_USB_MICROTEK is not set # CONFIG_USB_HPUSBSCSI is not set diff --git a/packages/linux/unslung-kernel_2.3r25.bb b/packages/linux/unslung-kernel_2.3r25.bb index e69de29bb2..95093d1960 100644 --- a/packages/linux/unslung-kernel_2.3r25.bb +++ b/packages/linux/unslung-kernel_2.3r25.bb @@ -0,0 +1,32 @@ +SECTION = "kernel" + +include nslu2-linksys-kernel_2.4.22.bb + +DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" +MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" +PR = "r14" + +KERNEL_SUFFIX = "unslung" + +CMDLINE_ROOT = "root=/dev/ram0 rw init=/linuxrc initrd=0x01000000,10M mem=32M@0x00000000" + +UNSLUNG_KERNEL_EXTRA_SRC_URI ?= + +SRC_URI += "file://limit1gb.patch;patch=1 \ + file://gl811e.patch;patch=1 \ + file://ext3flash-on-disk1.patch;patch=1 \ + file://usbnet.patch;patch=1 \ + file://missing-usb-ioctls.patch;patch=1 \ + file://anonymiser.patch;patch=1 \ + file://ppp_mppe.patch;patch=1 \ + ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +python () { + # Don't build unslung kernel unless we're targeting an nslu2 + mach = bb.data.getVar("MACHINE", d, 1) + dist = bb.data.getVar("DISTRO", d, 1) + if mach != 'nslu2' or dist != 'unslung': + raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") +} diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 058f4e4492..0cb9379d69 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for Opie and QPE" MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" SECTION = "opie/base" ALLOW_EMPTY = 1 -PR = "r21" +PR = "r22" PACKAGE_ARCH = "all" LICENSE = "MIT" @@ -125,7 +125,7 @@ poqetpresenter \ portabase \ qpdf2 \ qpealarmclock \ -qpe-gaim \ +qpe-gaim1 \ qpegps \ qpenmapfe \ qplot \ @@ -394,6 +394,8 @@ qpf-dejavuserif \ qpf-dejavuserifcondensed \ qpf-freemono \ qpf-freeserif \ +qpf-gentium \ +qpf-gentiumalt \ qpf-hunky \ qpf-hunkysans \ qpf-hunkyserif \ diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index aa87497f1f..51f8e24f81 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -35,10 +35,9 @@ OPIE_LIBS_RDEPENDS_append_tosa = " ${OPIE_FONTS_LARGE}" # Things for reasonable bootstrap image # -OPIE_BASE_APPLETS = "opie-aboutapplet opie-clockapplet opie-logoutapplet \ - opie-suspendapplet opie-batteryapplet opie-homeapplet \ - opie-multikeyapplet opie-rotateapplet opie-vtapplet \ - opie-cardmon opie-irdaapplet opie-brightnessapplet" +OPIE_BASE_APPLETS = "opie-aboutapplet opie-clockapplet opie-suspendapplet opie-batteryapplet \ + opie-homeapplet opie-multikeyapplet opie-rotateapplet opie-cardmon \ + opie-irdaapplet opie-brightnessapplet" OPIE_BASE_INPUTMETHODS = "opie-multikey opie-handwriting opie-pickboard" @@ -62,6 +61,10 @@ OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \ # OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet" +# Zaurus models can benefit from the VT and logout applets +OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet" +OPIE_BASE_APPLETS_append_ramses = " opie-vtapplet opie-logoutapplet" + # # Additional things for a standard 16MB distribution # @@ -71,7 +74,8 @@ OPIE_PIM_BASE = "opie-alarm opie-drawpad opie-textedit" OPIE_PIM_MAIL = "opie-mail" OPIE_PIM = "${OPIE_PIM_BASE} opie-addressbook opie-datebook opie-todo opie-today \ - opie-today opie-today-addressbookplugin opie-today-datebookplugin opie-today-todolistplugin" + opie-today-addressbookplugin opie-today-datebookplugin opie-today-todolistplugin \ + opie-datebook-nationalholidayplugin opie-datebook-birthdayplugin " KDE_PIM_DEPENDS = "${OPIE_PIM_BASE} kdepimpi" KDE_PIM_RDEPENDS = "kopi kapi kopi-applet" @@ -87,8 +91,10 @@ OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-sec # Additional things for a >= 24MB distribution # -OPIE_DEPENDS_24 = "konqueror-embedded" -OPIE_RDEPENDS_24 = "konqueror-embedded" +OPIE_DEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop opie-reader \ + qpdf2 froot opie-wellenreiter" +OPIE_RDEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop opie-reader \ + qpdf2 froot opie-wellenreiter" # # diff --git a/packages/mystun-server/files/init b/packages/mystun-server/files/init new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mystun-server/files/init diff --git a/packages/mystun-server/files/nossl.patch b/packages/mystun-server/files/nossl.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mystun-server/files/nossl.patch diff --git a/packages/mystun-server/mystun-server_cvs.bb b/packages/mystun-server/mystun-server_cvs.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mystun-server/mystun-server_cvs.bb diff --git a/packages/nonworking/remind/remind_03.00.22.bb b/packages/nonworking/remind/remind_03.00.22.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nonworking/remind/remind_03.00.22.bb diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/create-ramdisks.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/create-ramdisks.patch index 5783dae078..5ba8bc6607 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/create-ramdisks.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/create-ramdisks.patch @@ -1,27 +1,29 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-11-09 21:45:46.000000000 +1030 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-11-09 21:41:47.000000000 +1030 -@@ -13,7 +13,23 @@ +@@ -13,7 +13,25 @@ mkdir -p /var/lock/samba >/dev/null -/bin/echo "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64 -/bin/echo "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128 + -+/bin/echo "Creating ramfs for /dev:" -+/bin/mount -t ramfs ramfs /mnt/tmpmnt -+/bin/cp -rp /dev/* /mnt/tmpmnt/ -+/bin/mkdir -p /dev.state -+/bin/mount -o bind /dev /dev.state -+/bin/mount -o bind /mnt/tmpmnt /dev -+/bin/umount /mnt/tmpmnt -+/bin/echo "Creating ramfs for /var:" -+/bin/mount -t ramfs ramfs /mnt/tmpmnt -o maxsize=256 -+/bin/cp -rp /var/* /mnt/tmpmnt/ -+/bin/mkdir -p /var.state -+/bin/mount -o bind /var /var.state -+/bin/mount -o bind /mnt/tmpmnt /var -+/bin/umount /mnt/tmpmnt -+/bin/killall syslogd -+/bin/killall klogd ++if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then ++ /bin/echo "Creating ramfs for /dev:" ++ /bin/mount -t ramfs ramfs /mnt/tmpmnt ++ /bin/cp -rp /dev/* /mnt/tmpmnt/ ++ /bin/mkdir -p /dev.state ++ /bin/mount -o bind /dev /dev.state ++ /bin/mount -o bind /mnt/tmpmnt /dev ++ /bin/umount /mnt/tmpmnt ++ /bin/echo "Creating ramfs for /var:" ++ /bin/mount -t ramfs ramfs /mnt/tmpmnt -o maxsize=256 ++ /bin/cp -rp /var/* /mnt/tmpmnt/ ++ /bin/mkdir -p /var.state ++ /bin/mount -o bind /var /var.state ++ /bin/mount -o bind /mnt/tmpmnt /var ++ /bin/umount /mnt/tmpmnt ++ /bin/killall syslogd ++ /bin/killall klogd ++fi + mkdir -p /var/log/samba >/dev/null touch /var/log/server.log >/dev/null diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch index cfdbb0b7b4..2ee70b19e7 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch @@ -1,6 +1,6 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-09-01 21:47:47.000000000 -0400 -@@ -1,4 +1,26 @@ +@@ -1,4 +1,43 @@ ## Simple beta script to verify csr + +if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi @@ -14,21 +14,33 @@ + ( cd /home/httpd/html/Management ; mv upgrade-maint.htm upgrade.htm ) +fi + -+#if ( [ -f /.sda2root ] || [ -f /.sdb2root ] ) ; then -+# echo "Root filesystem is running a external disk ..." -+# ( cd /home/httpd/html/Management ; mv upgrade-maint.htm upgrade.htm ) -+#fi ++if ( [ -f /.sda1root ] || [ -f /.sdb1root ] || [ -f /.sda2root ] || [ -f /.sdb2root ] ) ; then ++ echo "Root filesystem is running a external disk ..." ++ ( cd /home/httpd/html/Management ; cp upgrade-maint.htm upgrade.htm ) ++fi + +# Wait for the USB disks to be recognised. +sleep 5 + +if ( [ -f /proc/hd_conn ] ) ; then -+ /bin/mount -t ext3 /dev/sda2 /share/hdd/conf -+ /bin/rm -rf /mnt/sda2 ; /bin/ln -s /share/hdd/conf /mnt/sda2 ++ if ( [ -f /.sda1root ] ) ; then ++ /bin/mount -t ext3 /dev/sda1 /share/hdd/data ++ /bin/rm -rf /mnt/sda1 ; /bin/ln -s /share/hdd/data /mnt/sda1 ++ fi ++ if ( [ -f /.sda2root ] ) ; then ++ /bin/mount -t ext3 /dev/sda2 /share/hdd/conf ++ /bin/rm -rf /mnt/sda2 ; /bin/ln -s /share/hdd/conf /mnt/sda2 ++ fi +fi + +if ( [ -f /proc/hd2_conn ] ) ; then -+ /bin/mount -t ext3 /dev/sdb2 /share/flash/conf -+ /bin/rm -rf /mnt/sdb2 ; /bin/ln -s /share/flash/conf /mnt/sdb2 ++ if ( [ -f /.sdb1root ] ) ; then ++ /bin/mount -t ext3 /dev/sdb2 /share/flash/data ++ /bin/rm -rf /mnt/sdb1 ; /bin/ln -s /share/flash/data /mnt/sdb1 ++ fi ++ if ( [ -f /.sdb2root ] ) ; then ++ /bin/mount -t ext3 /dev/sdb2 /share/flash/conf ++ /bin/rm -rf /mnt/sdb2 ; /bin/ln -s /share/flash/conf /mnt/sdb2 ++ fi +fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.1-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.1-diversion.patch index b0b9ad5dba..4cf28fa73a 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.1-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.1-diversion.patch @@ -1,18 +1,30 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1~ 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2004-09-01 21:56:17.000000000 -0400 -@@ -1,5 +1,17 @@ +@@ -1,5 +1,29 @@ #!/bin/sh ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.1 ] && . /mnt/sda1/unslung/rc.1 ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.1 ] && . /mnt/sda2/unslung/rc.1 ) ; then return 0 ; fi -+if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.1 ] && . /mnt/sdb2/unslung/rc.1 ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.1 ] && . /mnt/sdb1/unslung/rc.1 ) ; then return 0 ; fi ++if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.1 ] && . /mnt/sdb2/unslung/rc.1 ) ; then return 0 ; fi +if ( [ -f /unslung/rc.1 ] && . /unslung/rc.1 ) ; then return 0 ; fi + +if ( [ -f /proc/hd_conn ] ) ; then -+ /bin/umount /dev/sda2 ++ if ( [ -f /.sda1root ] ) ; then ++ /bin/umount /dev/sda1 ++ fi ++ if ( [ -f /.sda2root ] ) ; then ++ /bin/umount /dev/sda2 ++ fi +fi + +if ( [ -f /proc/hd2_conn ] ) ; then -+ /bin/umount /dev/sdb2 ++ if ( [ -f /.sdb1root ] ) ; then ++ /bin/umount /dev/sdb1 ++ fi ++ if ( [ -f /.sdb2root ] ) ; then ++ /bin/umount /dev/sdb2 ++ fi +fi + #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04 diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.crond-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.crond-diversion.patch index 6c7327c199..a67abe6ce4 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.crond-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.crond-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond 2004-09-01 21:56:37.000000000 -0400 -@@ -1,5 +1,9 @@ +@@ -1,5 +1,11 @@ #!/bin/sh ++if ( [ ! -f /.sda1root ] && [ -r /mnt/sda1/unslung/rc.crond ] && . /mnt/sda1/unslung/rc.crond ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.crond ] && . /mnt/sda2/unslung/rc.crond ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -r /mnt/sdb1/unslung/rc.crond ] && . /mnt/sdb1/unslung/rc.crond ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -r /mnt/sdb2/unslung/rc.crond ] && . /mnt/sdb2/unslung/rc.crond ) ; then return 0 ; fi +if ( [ -r /unslung/rc.crond ] && . /unslung/rc.crond ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.halt-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.halt-diversion.patch index 163586314e..d8592a4f10 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.halt-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.halt-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt 2004-09-01 21:57:01.000000000 -0400 -@@ -1,4 +1,11 @@ +@@ -1,4 +1,13 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -r /mnt/sda1/unslung/rc.halt ] && . /mnt/sda1/unslung/rc.halt ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.halt ] && . /mnt/sda2/unslung/rc.halt ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -r /mnt/sdb1/unslung/rc.halt ] && . /mnt/sdb1/unslung/rc.halt ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -r /mnt/sdb2/unslung/rc.halt ] && . /mnt/sdb2/unslung/rc.halt ) ; then return 0 ; fi +if ( [ -r /unslung/rc.halt ] && . /unslung/rc.halt ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.local-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.local-diversion.patch index 3a9474c137..a184e002e3 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.local-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.local-diversion.patch @@ -1,11 +1,13 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local 2004-09-01 21:57:17.000000000 -0400 -@@ -1,5 +1,11 @@ +@@ -1,5 +1,13 @@ #!/bin/sh + HOSTNAME=`hostname` + ++if ( [ ! -f /.sda1root ] && [ -r /mnt/sda1/unslung/rc.local ] && . /mnt/sda1/unslung/rc.local ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.local ] && . /mnt/sda2/unslung/rc.local ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -r /mnt/sdb1/unslung/rc.local ] && . /mnt/sdb1/unslung/rc.local ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -r /mnt/sdb2/unslung/rc.local ] && . /mnt/sdb2/unslung/rc.local ) ; then return 0 ; fi +if ( [ -r /unslung/rc.local ] && . /unslung/rc.local ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.modules-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.modules-diversion.patch index 46a880257b..c348351554 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.modules-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.modules-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules 2004-09-01 21:57:34.000000000 -0400 -@@ -1,4 +1,9 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.modules ] && . /mnt/sda1/unslung/rc.modules ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.modules ] && . /mnt/sda2/unslung/rc.modules ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.modules ] && . /mnt/sdb1/unslung/rc.modules ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.modules ] && . /mnt/sdb2/unslung/rc.modules ) ; then return 0 ; fi +if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.network-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.network-diversion.patch index 02e7e85b16..86520804eb 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.network-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.network-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network 2004-09-01 21:57:46.000000000 -0400 -@@ -1,3 +1,8 @@ +@@ -1,3 +1,10 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.network ] && . /mnt/sda1/unslung/rc.network ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.network ] && . /mnt/sda2/unslung/rc.network ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.network ] && . /mnt/sdb1/unslung/rc.network ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.network ] && . /mnt/sdb2/unslung/rc.network ) ; then return 0 ; fi +if ( [ -f /unslung/rc.network ] && . /unslung/rc.network ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quickset-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quickset-diversion.patch index 6f5de333e8..c1be3cd299 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quickset-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quickset-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset 2004-09-01 21:57:57.000000000 -0400 -@@ -1,3 +1,8 @@ +@@ -1,3 +1,10 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.quickset ] && . /mnt/sda1/unslung/rc.quickset ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.quickset ] && . /mnt/sda2/unslung/rc.quickset ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.quickset ] && . /mnt/sdb1/unslung/rc.quickset ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.quickset ] && . /mnt/sdb2/unslung/rc.quickset ) ; then return 0 ; fi +if ( [ -f /unslung/rc.quickset ] && . /unslung/rc.quickset ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quota-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quota-diversion.patch index bef9686cdc..2a66ae9a11 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quota-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quota-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota 2004-09-01 21:58:08.000000000 -0400 -@@ -1,5 +1,9 @@ +@@ -1,5 +1,11 @@ #!/bin/sh ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.quota ] && . /mnt/sda1/unslung/rc.quota ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.quota ] && . /mnt/sda2/unslung/rc.quota ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.quota ] && . /mnt/sdb1/unslung/rc.quota ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.quota ] && . /mnt/sdb2/unslung/rc.quota ) ; then return 0 ; fi +if ( [ -f /unslung/rc.quota ] && . /unslung/rc.quota ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reboot-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reboot-diversion.patch index 1b8bf97fdf..2d7b8c6694 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reboot-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reboot-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot 2004-09-01 21:58:19.000000000 -0400 -@@ -1,4 +1,11 @@ +@@ -1,4 +1,13 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -r /mnt/sda1/unslung/rc.reboot ] && . /mnt/sda1/unslung/rc.reboot ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.reboot ] && . /mnt/sda2/unslung/rc.reboot ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -r /mnt/sdb1/unslung/rc.reboot ] && . /mnt/sdb1/unslung/rc.reboot ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -r /mnt/sdb2/unslung/rc.reboot ] && . /mnt/sdb2/unslung/rc.reboot ) ; then return 0 ; fi +if ( [ -r /unslung/rc.reboot ] && . /unslung/rc.reboot ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reset_usrgrpshare-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reset_usrgrpshare-diversion.patch index ea5716e69a..49d803b91f 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reset_usrgrpshare-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reset_usrgrpshare-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare 2004-09-01 21:58:36.000000000 -0400 -@@ -1,2 +1,7 @@ +@@ -1,2 +1,9 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.reset_usrgrpshare ] && . /mnt/sda1/unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.reset_usrgrpshare ] && . /mnt/sda2/unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.reset_usrgrpshare ] && . /mnt/sdb1/unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.reset_usrgrpshare ] && . /mnt/sdb2/unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi +if ( [ -f /unslung/rc.reset_usrgrpshare ] && . /unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.rstimezone-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.rstimezone-diversion.patch index d30e60e6ce..14331defed 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.rstimezone-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.rstimezone-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone 2004-09-01 21:58:47.000000000 -0400 -@@ -1,4 +1,9 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.rstimezone ] && . /mnt/sda1/unslung/rc.rstimezone ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.rstimezone ] && . /mnt/sda2/unslung/rc.rstimezone ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.rstimezone ] && . /mnt/sdb1/unslung/rc.rstimezone ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.rstimezone ] && . /mnt/sdb2/unslung/rc.rstimezone ) ; then return 0 ; fi +if ( [ -f /unslung/rc.rstimezone ] && . /unslung/rc.rstimezone ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.samba-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.samba-diversion.patch index e28b533636..5f9a91b071 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.samba-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.samba-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba 2004-09-01 21:58:57.000000000 -0400 -@@ -1,4 +1,9 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.samba ] && . /mnt/sda1/unslung/rc.samba ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.samba ] && . /mnt/sda2/unslung/rc.samba ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.samba ] && . /mnt/sdb1/unslung/rc.samba ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.samba ] && . /mnt/sdb2/unslung/rc.samba ) ; then return 0 ; fi +if ( [ -f /unslung/rc.samba ] && . /unslung/rc.samba ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.sysinit-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.sysinit-diversion.patch index e899fca1e4..a15113b293 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.sysinit-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.sysinit-diversion.patch @@ -1,6 +1,6 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-09-01 21:59:04.000000000 -0400 -@@ -1,7 +1,13 @@ +@@ -1,7 +1,15 @@ #!/bin/sh -export PATH=/bin:/sbin:/usr/bin:/usr/sbin +export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin @@ -8,7 +8,9 @@ . /etc/rc.d/rc.functions . /etc/sysconfig/network + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.sysinit ] && . /mnt/sda1/unslung/rc.sysinit ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.sysinit ] && . /mnt/sda2/unslung/rc.sysinit ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.sysinit ] && . /mnt/sdb1/unslung/rc.sysinit ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.sysinit ] && . /mnt/sdb2/unslung/rc.sysinit ) ; then return 0 ; fi +if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.thttpd-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.thttpd-diversion.patch index a360fa4f6b..10f4c03abf 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.thttpd-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.thttpd-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd 2004-09-01 21:59:13.000000000 -0400 -@@ -1,4 +1,9 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.thttpd ] && . /mnt/sda1/unslung/rc.thttpd ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.thttpd ] && . /mnt/sda2/unslung/rc.thttpd ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.thttpd ] && . /mnt/sdb1/unslung/rc.thttpd ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.thttpd ] && . /mnt/sdb2/unslung/rc.thttpd ) ; then return 0 ; fi +if ( [ -f /unslung/rc.thttpd ] && . /unslung/rc.thttpd ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-start b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-start index 1e6dbb5559..33f2e3ee0b 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-start +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-start @@ -1,12 +1,10 @@ #!/bin/sh +if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.unslung-start ] && . /mnt/sda1/unslung/rc.unslung-start ) ; then return 0 ; fi if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.unslung-start ] && . /mnt/sda2/unslung/rc.unslung-start ) ; then return 0 ; fi +if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.unslung-start ] && . /mnt/sdb1/unslung/rc.unslung-start ) ; then return 0 ; fi if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.unslung-start ] && . /mnt/sdb2/unslung/rc.unslung-start ) ; then return 0 ; fi if ( [ -f /unslung/rc.unslung-start ] && . /unslung/rc.unslung-start ) ; then return 0 ; fi -# For backwards compatibility, will be removed in Unslung 4.x -if ( [ -f /mnt/sda2/unslung/rc.unslung ] && . /mnt/sda2/unslung/rc.unslung ) ; then return 0 ; fi -if ( [ -f /mnt/sdb2/unslung/rc.unslung ] && . /mnt/sdb2/unslung/rc.unslung ) ; then return 0 ; fi -if ( [ -f /unslung/rc.unslung ] && . /unslung/rc.unslung ) ; then return 0 ; fi # Start all init scripts in /opt/etc/init.d # executing them in numerical order. diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-stop b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-stop index be0070198d..f5e8cedd5f 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-stop +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-stop @@ -1,6 +1,8 @@ #!/bin/sh +if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.unslung-stop ] && . /mnt/sda1/unslung/rc.unslung-stop ) ; then return 0 ; fi if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.unslung-stop ] && . /mnt/sda2/unslung/rc.unslung-stop ) ; then return 0 ; fi +if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.unslung-stop ] && . /mnt/sdb1/unslung/rc.unslung-stop ) ; then return 0 ; fi if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.unslung-stop ] && . /mnt/sdb2/unslung/rc.unslung-stop ) ; then return 0 ; fi if ( [ -f /unslung/rc.unslung-stop ] && . /unslung/rc.unslung-stop ) ; then return 0 ; fi diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.xinetd-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.xinetd-diversion.patch index f9c8c62482..7a742503cc 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.xinetd-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.xinetd-diversion.patch @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd 2004-09-01 21:59:34.000000000 -0400 -@@ -1,4 +1,9 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.xinetd ] && . /mnt/sda1/unslung/rc.xinetd ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.xinetd ] && . /mnt/sda2/unslung/rc.xinetd ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.xinetd ] && . /mnt/sdb1/unslung/rc.xinetd ) ; then return 0 ; fi +if ( [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.xinetd ] && . /mnt/sdb2/unslung/rc.xinetd ) ; then return 0 ; fi +if ( [ -f /unslung/rc.xinetd ] && . /unslung/rc.xinetd ) ; then return 0 ; fi + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/remount-noatime.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/remount-noatime.patch index e69de29bb2..730e8ffde1 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/remount-noatime.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/remount-noatime.patch @@ -0,0 +1,31 @@ +--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1~ 2004-11-09 21:45:52.000000000 +1030 ++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2004-11-09 21:44:27.000000000 +1030 +@@ -27,6 +27,14 @@ + #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04 + /bin/echo "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status + ++if ( [ -f /mnt/sda1/.ext3flash ] || [ -f /mnt/sda2/.ext3flash ] ) ; then ++ /bin/echo "Remounting /dev/sda1 as ext3flash:" ++ /bin/mount -o remount,rw,noatime /dev/sda1 ++ /bin/echo "Remounting /dev/sda2 as ext3flash:" ++ /bin/mount -o remount,rw,noatime /dev/sda2 ++ /bin/echo "Removing swap from ext3flash:" ++ /sbin/swapoff /dev/sda3 ++fi + + /bin/echo "Restore time and timezone:"; /etc/rc.d/rc.rstimezone; check_status + /bin/echo "Restore usrgrpshares:"; /etc/rc.d/rc.reset_usrgrpshare; check_status +--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota~ 2004-11-11 00:05:21.000000000 +1030 ++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota 2004-11-11 00:04:52.000000000 +1030 +@@ -14,6 +14,11 @@ + echo "Done." + fi + ++if ( [ -f /mnt/sda1/.ext3flash ] || [ -f /mnt/sda2/.ext3flash ] ) ; then ++ /bin/echo "Remounting /dev/sda1 as ext3flash:" ++ /bin/mount -o remount,rw,noatime /dev/sda1 ++fi ++ + if [ -x "/usr/bin/quotaon" ] + then + echo "Turning on quota." diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling index 4da1b9ba82..c640630bba 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling @@ -108,15 +108,20 @@ else rm -rf $targ/var ; mv $targ/var.state $targ/var rm -f /.sda1root /.sda2root /.sdb1root /.sdb2root + rm -f $targ/.sda1root $targ/.sda2root $targ/.sdb1root $targ/.sdb2root if [ "$targ" = "/share/hdd/data" ] ; then echo > /.sda1root + echo > $targ/.sda1root elif [ "$targ" = "/share/hdd/conf" ] ; then echo > /.sda2root + echo > $targ/.sda2root elif [ "$targ" = "/share/flash/data" ] ; then echo > /.sdb1root + echo > $targ/.sdb1root elif [ "$targ" = "/share/flash/conf" ] ; then echo > /.sdb2root + echo > $targ/.sdb2root fi fi diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb index e69de29bb2..83d2b273e8 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb @@ -0,0 +1,95 @@ +SECTION = "base" + +PR = "r46" + +UNSLUNG_VERSION = "4.7-alpha" + +DEPENDS = "nslu2-linksys-libs" + +SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \ + file://README \ + file://linuxrc \ + file://unsling \ + file://resling \ + file://rc.unslung-start \ + file://rc.unslung-stop \ + file://rc-diversion.patch;patch=1 \ + file://rc.1-diversion.patch;patch=1 \ + file://rc.crond-diversion.patch;patch=1 \ + file://rc.halt-diversion.patch;patch=1 \ + file://rc.local-diversion.patch;patch=1 \ + file://rc.modules-diversion.patch;patch=1 \ + file://rc.network-diversion.patch;patch=1 \ + file://rc.quickset-diversion.patch;patch=1 \ + file://rc.quota-diversion.patch;patch=1 \ + file://rc.reboot-diversion.patch;patch=1 \ + file://rc.reset_usrgrpshare-diversion.patch;patch=1 \ + file://rc.rstimezone-diversion.patch;patch=1 \ + file://rc.samba-diversion.patch;patch=1 \ + file://rc.sysinit-diversion.patch;patch=1 \ + file://rc.thttpd-diversion.patch;patch=1 \ + file://rc.xinetd-diversion.patch;patch=1 \ + file://root-passwd.patch;patch=1 \ + file://create-ramdisks.patch;patch=1 \ + file://remount-noatime.patch;patch=1 \ + file://initialise-mtab.patch;patch=1 \ + file://mount_usbdevfs.patch;patch=1 \ + file://maintmode.cgi file://upgrade-maint.htm file://upgrade-nomaint.htm \ + " + +S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r25" + +python () { + # Don't build unslung images unless we're targeting an nslu2 + mach = bb.data.getVar("MACHINE", d, 1) + dist = bb.data.getVar("DISTRO", d, 1) + if mach != 'nslu2' or dist != 'unslung': + raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") +} + +do_compile () { + echo "V2.3R25-uNSLUng-${UNSLUNG_VERSION}" > ${S}/.unslung + + sed -i -e s/@version#/@version#-uNSLUng-${UNSLUNG_VERSION}/ ${S}/home/httpd/html/home.htm + sed -i -e 's|> <|><a href="Unslung" class="mainmenu" target="_top">Unslung Doco</a><|' \ + ${S}/home/httpd/html/manhead.htm + + # Somehow these two slipped through - this is easier than updating the tar file. + rm -f ${S}/etc/rc.orig + rm -f ${S}/etc/rc.d/rc.1.orig + + install -d ${S}/initrd + + install -m 755 ${WORKDIR}/linuxrc ${S}/linuxrc + install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling + install -m 755 ${WORKDIR}/resling ${S}/sbin/resling + install -m 755 ${WORKDIR}/rc.unslung-start ${S}/etc/rc.d/rc.unslung-start + install -m 755 ${WORKDIR}/rc.unslung-stop ${S}/etc/rc.d/rc.unslung-stop + + install -d ${S}/opt/doc + install -m 755 ${WORKDIR}/README ${S}/opt/doc/README + ln -s /opt/doc ${S}/home/httpd/html/Unslung + + # Remove the libraries, because they are in nslu2-linksys-libs now + rm -rf ${S}/lib + + # Install maintenance mode files + install -m 755 ${WORKDIR}/maintmode.cgi ${S}/home/httpd/html/Management + install -m 644 ${WORKDIR}/upgrade-maint.htm ${S}/home/httpd/html/Management/upgrade-maint.htm + install -m 644 ${WORKDIR}/upgrade-nomaint.htm ${S}/home/httpd/html/Management/upgrade-nomaint.htm + install -m 644 ${WORKDIR}/upgrade-nomaint.htm ${S}/home/httpd/html/Management/upgrade.htm + sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \ + ${S}/home/httpd/html/Management/upgrade-maint.htm + sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \ + ${S}/home/httpd/html/Management/upgrade-nomaint.htm + sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \ + ${S}/home/httpd/html/Management/upgrade.htm +} + +do_install () { + ( cd ${S} ; tar -c -v -f - --exclude '.pc' . ) | ( cd ${D} ; tar xvf - ) +} + +PACKAGES = "${PN}" +FILES_${PN} = "/" +RDEPENDS_${PN} = "nslu2-linksys-libs" diff --git a/packages/opie-login/opie-login_1.1.9.bb b/packages/opie-login/opie-login_1.1.9.bb index b58e7fff6d..f2e98bf54f 100644 --- a/packages/opie-login/opie-login_1.1.9.bb +++ b/packages/opie-login/opie-login_1.1.9.bb @@ -3,6 +3,8 @@ SECTION = "opie/base" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" +RRECOMMENDS = "opie-logoutapplet" +PR = "r1" BROKEN = 1 diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb index 007f68ef7e..147f2989cf 100644 --- a/packages/opie-login/opie-login_cvs.bb +++ b/packages/opie-login/opie-login_cvs.bb @@ -3,6 +3,8 @@ SECTION = "opie/base" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" +RRECOMMENDS = "opie-logoutapplet" +PR = "r1" PV = "1.1.9+cvs-${CVSDATE}" APPNAME = "opie-login" diff --git a/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch b/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch diff --git a/packages/orinoco/orinoco-modules_0.13e-26.bb b/packages/orinoco/orinoco-modules_0.13e-26.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/orinoco/orinoco-modules_0.13e-26.bb diff --git a/packages/qmake/files/ramses/linux-oe-qmake.conf b/packages/qmake/files/ramses/linux-oe-qmake.conf deleted file mode 100644 index ad0311256f..0000000000 --- a/packages/qmake/files/ramses/linux-oe-qmake.conf +++ /dev/null @@ -1,81 +0,0 @@ -# -# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release ramses - -QMAKE_CC = $(OE_QMAKE_CC) -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_THREAD = -D_REENTRANT - -QMAKE_CXX = $(OE_QMAKE_CXX) -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) -QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = $(OE_QMAKE_LINK) -QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,-soname, -QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath-link, - -QMAKE_LIBS = $(LIBS_EXTRA) -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) -QMAKE_LIBS_X11SM = -QMAKE_LIBS_QT = -l$(OE_QMAKE_LIBS_QT) -QMAKE_LIBS_QT_THREAD = -l$(OE_QMAKE_LIBS_QT)-mt -QMAKE_LIBS_QT_OPENGL = -lqgl -QMAKE_LIBS_THREAD = -lpthread - -QMAKE_MOC = $(OE_QMAKE_MOC) -QMAKE_UIC = $(OE_QMAKE_UIC) - -QMAKE_AR = $(OE_QMAKE_AR) cqs -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_COPY_FILE = $(COPY) -QMAKE_COPY_DIR = $(COPY) -r -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = $(OE_QMAKE_STRIP) -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p - diff --git a/packages/qpf-fonts/qpf-dejavusans_1.7.bb b/packages/qpf-fonts/qpf-dejavusans_1.7.bb deleted file mode 100644 index c550ed5188..0000000000 --- a/packages/qpf-fonts/qpf-dejavusans_1.7.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "DejaVu Sans font - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" -LICENSE = "Bitstream Vera" -HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" -PACKAGE_ARCH = "all" -PR = "r1" - -SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/${PN}-${PV}.tar.bz2" - -S = "${WORKDIR}/${PN}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -inherit qpf diff --git a/packages/qpf-fonts/qpf-dejavusans_1.8.bb b/packages/qpf-fonts/qpf-dejavusans_1.8.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavusans_1.8.bb diff --git a/packages/qpf-fonts/qpf-dejavusansmono_1.7.bb b/packages/qpf-fonts/qpf-dejavusansmono_1.7.bb deleted file mode 100644 index 939cc88149..0000000000 --- a/packages/qpf-fonts/qpf-dejavusansmono_1.7.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "DejaVu Sans Mono font - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" -LICENSE = "Bitstream Vera" -HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" -PACKAGE_ARCH = "all" -PR = "r1" - -SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/${PN}-${PV}.tar.bz2" - -S = "${WORKDIR}/${PN}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -inherit qpf diff --git a/packages/qpf-fonts/qpf-dejavusansmono_1.8.bb b/packages/qpf-fonts/qpf-dejavusansmono_1.8.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavusansmono_1.8.bb diff --git a/packages/qpf-fonts/qpf-dejavuserif_1.7.bb b/packages/qpf-fonts/qpf-dejavuserif_1.7.bb deleted file mode 100644 index 944b100941..0000000000 --- a/packages/qpf-fonts/qpf-dejavuserif_1.7.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "DejaVu Serif font - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" -LICENSE = "Bitstream Vera" -HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" -PACKAGE_ARCH = "all" -PR = "r1" - -SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/${PN}-${PV}.tar.bz2" - -S = "${WORKDIR}/${PN}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -inherit qpf diff --git a/packages/qpf-fonts/qpf-dejavuserif_1.8.bb b/packages/qpf-fonts/qpf-dejavuserif_1.8.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavuserif_1.8.bb diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_1.7.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_1.7.bb deleted file mode 100644 index b090cba093..0000000000 --- a/packages/qpf-fonts/qpf-dejavuserifcondensed_1.7.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "DejaVu Serif Condensed font - QPF Edition" -SECTION = "opie/fonts" -PRIORITY = "optional" -MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" -LICENSE = "Bitstream Vera" -HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" -PACKAGE_ARCH = "all" -PR = "r1" - -SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/${PN}-${PV}.tar.bz2" - -S = "${WORKDIR}/${PN}" - -do_install () { - install -d ${D}${palmqtdir}/lib/fonts/ - for i in *.qpf; do - install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} - done -} - -inherit qpf diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_1.8.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_1.8.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_1.8.bb diff --git a/packages/qpf-fonts/qpf-gentium_1.01.bb b/packages/qpf-fonts/qpf-gentium_1.01.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpf-fonts/qpf-gentium_1.01.bb diff --git a/packages/qpf-fonts/qpf-gentiumalt_1.01.bb b/packages/qpf-fonts/qpf-gentiumalt_1.01.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpf-fonts/qpf-gentiumalt_1.01.bb diff --git a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb index 089924bd5f..a25fc734ac 100644 --- a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb +++ b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb @@ -5,7 +5,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "Bitstream Vera" HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html http://sourceforge.net/projects/hunkyfonts" PACKAGE_ARCH = "all" -PR = "r2" +PR = "r3" SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/${PN}-${PV}.tar.bz2" diff --git a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb index 1f3d0f87ac..3719286039 100644 --- a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb +++ b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb @@ -5,7 +5,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "Bitstream Vera" HOMEPAGE = "http://www.yoper.com/ariszlo/hunky.html http://sourceforge.net/projects/hunkyfonts" PACKAGE_ARCH = "all" -PR = "r2" +PR = "r3" SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/${PN}-${PV}.tar.bz2" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 3acac40d15..18cdc49ffd 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -6,7 +6,7 @@ LICENSE = "GPL QPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_ramses = "zlib libpng jpeg uicmoc-native" PROVIDES = "virtual/qte virtual/libqte2" -PR = "r8" +PR = "r9" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://qpe.patch;patch=1 \ @@ -135,4 +135,5 @@ do_install() { oe_libinstall -so -C lib libqte ${D}${palmqtdir}/lib/ } +PACKAGE_ARCH = "${MACHINE_ARCH}" FILES_${PN} = "${palmqtdir}" diff --git a/packages/ser/files/fix-sercfg.patch b/packages/ser/files/fix-sercfg.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ser/files/fix-sercfg.patch diff --git a/packages/ser/files/init b/packages/ser/files/init new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ser/files/init diff --git a/packages/ser/ser_0.9.0.bb b/packages/ser/ser_0.9.0.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ser/ser_0.9.0.bb diff --git a/packages/sysvinit/sysvinit/ramses/rcS b/packages/sysvinit/sysvinit/ramses/rcS new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sysvinit/sysvinit/ramses/rcS diff --git a/packages/tslib/tslib/ts.conf-h2200 b/packages/tslib/tslib/ts.conf-h2200 index e69de29bb2..ece916f39e 100644 --- a/packages/tslib/tslib/ts.conf-h2200 +++ b/packages/tslib/tslib/ts.conf-h2200 @@ -0,0 +1,6 @@ +module_raw input +module linear_h2200 +module pthres pmin=1 +module variance delta=30 +module dejitter delta=100 +module linear diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre23.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre23.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre23.bb diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb deleted file mode 100644 index 8f9aa62712..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb +++ /dev/null @@ -1,79 +0,0 @@ -DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/modules" -DEPENDS = "virtual/kernel" -RRECOMMENDS = "wlan-ng-utils" -MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://no-compat.patch;patch=1 \ - file://Ambit_usb.patch;patch=1 \ - file://scripts-makefile-hostcc.diff;patch=1;pnum=0 \ - file://pass-kernel-cross.patch;patch=1;pnum=0 \ - file://OZ-Configure.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://config.in \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -inherit module - -MAKE_TARGETS = "all" - -do_configure() { - cp ${WORKDIR}/config.in ${S} - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - export PRISM2_PCMCIA=y - export WLAN_KERN_PCMCIA=y - fi - export PRISM2_PCI=y - export PRISM2_PLX=n - export PRISM2_USB=y - export TARGET_ROOT_ON_HOST=${D} - export RC_DIR=${sysconfdir} - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config -} - -# override module_do_install in module.oeclass - dont want to set CC and -# LD unless actually compiling the kernel modules - there are other user -# level programs to be compiled. Note we need to use same compiler -# that was used to build the kernel -do_compile() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - KERNEL_CC="${KERNEL_CC}" KERNEL_LD="${KERNEL_LD}" \ - ${MAKE_TARGETS} -} - -do_install() { - oe_runmake install DESTDIR=${D} TARGET_MODDIR= - echo "YYYYYYYYYYYYYYYYY" - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir} - mv ${D}/usr/local/man/* ${D}${mandir} - rm -r ${D}/usr/local/man - rm -rf ${D}/${sysconfdir}/init.d -} - -PACKAGES_prepend = "wlan-ng-utils " -FILES_wlan-ng-utils = "${sysconfdir} /sbin" -FILES_${PN} = "/lib" diff --git a/packages/wpa-supplicant/files/madwifi-bsd-fix.diff b/packages/wpa-supplicant/files/madwifi-bsd-fix.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wpa-supplicant/files/madwifi-bsd-fix.diff diff --git a/packages/wpa-supplicant/files/mtx-1/defconfig b/packages/wpa-supplicant/files/mtx-1/defconfig new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wpa-supplicant/files/mtx-1/defconfig diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb |