summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-09-20 07:04:35 +0000
committerRichard Purdie <richard@openedhand.com>2005-09-20 07:04:35 +0000
commitb4a7122cacef647dbec3db5c9ebe1e504a7670df (patch)
tree006885a1f4e8032062632ee1a091e72c32dd2810
parentf9e1d16bfa73a2df5254c63ae1abb6a4bbe0a062 (diff)
downloadpoky-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.gz
Updates against mainline OE
git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--openembedded/classes/autotools.bbclass2
-rw-r--r--openembedded/classes/base.bbclass14
-rw-r--r--openembedded/classes/package_ipk.bbclass1
-rw-r--r--openembedded/classes/qt3x11.bbclass1
-rw-r--r--openembedded/classes/qt4x11.bbclass1
-rw-r--r--openembedded/classes/sourcepkg.bbclass2
-rw-r--r--openembedded/conf/bitbake.conf3
-rw-r--r--openembedded/conf/distro/familiar-0.8.3.conf4
-rw-r--r--openembedded/conf/distro/openzaurus-3.5.4.conf15
-rw-r--r--openembedded/conf/distro/openzaurus.inc (renamed from openembedded/conf/distro/openzaurus.conf)0
-rw-r--r--openembedded/conf/distro/preferred-gpe-versions-2.7.inc7
-rw-r--r--openembedded/conf/local.conf.sample16
-rw-r--r--openembedded/conf/machine/ipaq-pxa270.conf7
-rw-r--r--openembedded/conf/machine/spitz.conf2
-rw-r--r--openembedded/conf/machine/zaurus-clamshell-2.6.conf7
-rw-r--r--openembedded/packages/base-files/base-files/ipaq-pxa270/fstab2
-rw-r--r--openembedded/packages/base-files/base-files_3.0.14.bb2
-rw-r--r--openembedded/packages/binutils/binutils.inc6
-rw-r--r--openembedded/packages/db/db_4.3.27.bb4
-rw-r--r--openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb3
-rw-r--r--openembedded/packages/hostap/hostap-modules-0.3.9/Makefile.patch11
-rw-r--r--openembedded/packages/hostap/hostap-modules-0.3.9/add_event.patch28
-rw-r--r--openembedded/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch77
-rw-r--r--openembedded/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch70
-rw-r--r--openembedded/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch (renamed from openembedded/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch)0
-rw-r--r--openembedded/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff (renamed from openembedded/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff)0
-rw-r--r--openembedded/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff (renamed from openembedded/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff)0
-rw-r--r--openembedded/packages/hostap/hostap-modules_0.3.9.bb (renamed from openembedded/packages/hostap/hostap-modules_0.4.4.bb)8
-rw-r--r--openembedded/packages/initscripts/initscripts_1.0.bb6
-rw-r--r--openembedded/packages/irda-utils/irda-utils_0.9.16.bb2
-rw-r--r--openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch72
-rw-r--r--openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff11
-rw-r--r--openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb6
-rw-r--r--openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb56
-rw-r--r--openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb61
-rw-r--r--openembedded/packages/matchbox-wm/matchbox-wm_svn.bb2
-rw-r--r--openembedded/packages/module-init-tools/module-init-tools_3.1.bb60
-rw-r--r--openembedded/packages/module-init-tools/module-init-tools_3.2-pre7.bb10
-rw-r--r--openembedded/packages/orinoco/spectrum-fw.bb20
-rwxr-xr-xopenembedded/packages/orinoco/spectrum-fw/get_symbol_fw43
-rwxr-xr-xopenembedded/packages/orinoco/spectrum-fw/parse_symbol_fw129
-rw-r--r--openembedded/packages/rp1109
-rw-r--r--openembedded/packages/tslib/tslib/ts.conf-h22001
-rwxr-xr-xopenembedded/packages/zaurus-updater/spitz/updater.sh26
-rw-r--r--openembedded/packages/zaurus-updater/zaurus-updater.bb11
45 files changed, 498 insertions, 420 deletions
diff --git a/openembedded/classes/autotools.bbclass b/openembedded/classes/autotools.bbclass
index 8a387da5ca..ec1d4af1a4 100644
--- a/openembedded/classes/autotools.bbclass
+++ b/openembedded/classes/autotools.bbclass
@@ -145,7 +145,7 @@ autotools_stage_includes() {
145 rm -rf ${STAGE_TEMP} 145 rm -rf ${STAGE_TEMP}
146 mkdir -p ${STAGE_TEMP} 146 mkdir -p ${STAGE_TEMP}
147 make DESTDIR="${STAGE_TEMP}" install 147 make DESTDIR="${STAGE_TEMP}" install
148 cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} 148 cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
149 rm -rf ${STAGE_TEMP} 149 rm -rf ${STAGE_TEMP}
150 fi 150 fi
151} 151}
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass
index 37254b94ba..18d51a02ed 100644
--- a/openembedded/classes/base.bbclass
+++ b/openembedded/classes/base.bbclass
@@ -371,7 +371,7 @@ def oe_unpack_file(file, data, url = None):
371 destdir = "." 371 destdir = "."
372 elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK): 372 elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK):
373 os.makedirs("%s/%s" % (os.getcwd(), destdir)) 373 os.makedirs("%s/%s" % (os.getcwd(), destdir))
374 cmd = 'cp -a %s %s/%s/' % (file, os.getcwd(), destdir) 374 cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir)
375 else: 375 else:
376 (type, host, path, user, pswd, parm) = bb.decodeurl(url) 376 (type, host, path, user, pswd, parm) = bb.decodeurl(url)
377 if not 'patch' in parm: 377 if not 'patch' in parm:
@@ -496,8 +496,16 @@ python base_eventhandler() {
496 note(msg) 496 note(msg)
497 497
498 if name.startswith("BuildStarted"): 498 if name.startswith("BuildStarted"):
499 statusvars = ['TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 499 bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
500 'TARGET_FPU'] 500 path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
501 path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )]
502 monotone_revision = "<unknown>"
503 try:
504 monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip()
505 except IOError:
506 pass
507 bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
508 statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'TARGET_FPU']
501 statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] 509 statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
502 statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) 510 statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
503 print statusmsg 511 print statusmsg
diff --git a/openembedded/classes/package_ipk.bbclass b/openembedded/classes/package_ipk.bbclass
index 3c6125d9e3..6d3e1eb686 100644
--- a/openembedded/classes/package_ipk.bbclass
+++ b/openembedded/classes/package_ipk.bbclass
@@ -145,6 +145,7 @@ python do_package_ipk () {
145 fields.append(["Maintainer: %s\n", ['MAINTAINER']]) 145 fields.append(["Maintainer: %s\n", ['MAINTAINER']])
146 fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']]) 146 fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
147 fields.append(["OE: %s\n", ['P']]) 147 fields.append(["OE: %s\n", ['P']])
148 fields.append(["Homepage: %s\n", ['HOMEPAGE']])
148 149
149 def pullData(l, d): 150 def pullData(l, d):
150 l2 = [] 151 l2 = []
diff --git a/openembedded/classes/qt3x11.bbclass b/openembedded/classes/qt3x11.bbclass
index 09b9cbac96..1023a1f800 100644
--- a/openembedded/classes/qt3x11.bbclass
+++ b/openembedded/classes/qt3x11.bbclass
@@ -1,3 +1,4 @@
1DEPENDS += "qt3-x11"
1# 2#
2# override variables set by qmake-base to compile Qt/X11 apps 3# override variables set by qmake-base to compile Qt/X11 apps
3# 4#
diff --git a/openembedded/classes/qt4x11.bbclass b/openembedded/classes/qt4x11.bbclass
index d4ca0073df..92885aa7ee 100644
--- a/openembedded/classes/qt4x11.bbclass
+++ b/openembedded/classes/qt4x11.bbclass
@@ -1,3 +1,4 @@
1DEPENDS += "qt4-x11"
1# 2#
2# override variables set by qmake-base to compile Qt/X11 apps 3# override variables set by qmake-base to compile Qt/X11 apps
3# 4#
diff --git a/openembedded/classes/sourcepkg.bbclass b/openembedded/classes/sourcepkg.bbclass
index ee022c99d2..3eeff91333 100644
--- a/openembedded/classes/sourcepkg.bbclass
+++ b/openembedded/classes/sourcepkg.bbclass
@@ -43,7 +43,7 @@ sourcepkg_do_create_orig_tgz(){
43 echo $src_tree 43 echo $src_tree
44 oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" 44 oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
45 tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz $src_tree --exclude-from temp/exclude-from-file 45 tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz $src_tree --exclude-from temp/exclude-from-file
46 cp -a $src_tree $src_tree.orig 46 cp -pPR $src_tree $src_tree.orig
47} 47}
48 48
49sourcepkg_do_archive_bb() { 49sourcepkg_do_archive_bb() {
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
index 04603d393d..7008ce9940 100644
--- a/openembedded/conf/bitbake.conf
+++ b/openembedded/conf/bitbake.conf
@@ -126,6 +126,7 @@ TMPDIR = "${TOPDIR}/tmp"
126CACHE = "${TMPDIR}/cache" 126CACHE = "${TMPDIR}/cache"
127DL_DIR = "${TMPDIR}/downloads" 127DL_DIR = "${TMPDIR}/downloads"
128CVSDIR = "${DL_DIR}/cvs" 128CVSDIR = "${DL_DIR}/cvs"
129GITDIR = "${DL_DIR}/git"
129 130
130STAMP = "${TMPDIR}/stamps/${PF}" 131STAMP = "${TMPDIR}/stamps/${PF}"
131WORKDIR = "${TMPDIR}/work/${PF}" 132WORKDIR = "${TMPDIR}/work/${PF}"
@@ -170,6 +171,8 @@ IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_
170IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" 171IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
171IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" 172IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
172IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." 173IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
174IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
175IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
173EXTRA_IMAGECMD = "" 176EXTRA_IMAGECMD = ""
174EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" 177EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
175EXTRA_IMAGECMD_squashfs = "-le -b 16384" 178EXTRA_IMAGECMD_squashfs = "-le -b 16384"
diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf
index 475117ceba..4b3d33dd9a 100644
--- a/openembedded/conf/distro/familiar-0.8.3.conf
+++ b/openembedded/conf/distro/familiar-0.8.3.conf
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/libiconv=glibc
21PREFERRED_PROVIDER_virtual/libintl=glibc 21PREFERRED_PROVIDER_virtual/libintl=glibc
22PREFERRED_PROVIDER_x11=diet-x11 22PREFERRED_PROVIDER_x11=diet-x11
23 23
24PREFERRED_VERSION_hostap-modules ?= "0.3.9 24PREFERRED_VERSION_hostap-modules ?= "0.3.9"
25 25
26# The CSL compiler is unusable because 26# The CSL compiler is unusable because
27# 1) certain programs stop to compile 27# 1) certain programs stop to compile
@@ -37,7 +37,7 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
37PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" 37PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
38PREFERRED_VERSION_qte = "2.3.10" 38PREFERRED_VERSION_qte = "2.3.10"
39 39
40#OPIE_VERSION = "1.2.0" 40OPIE_VERSION = "1.2.1"
41include conf/distro/preferred-opie-versions.inc 41include conf/distro/preferred-opie-versions.inc
42 42
43# 43#
diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
index 61458c0b03..fbc1970864 100644
--- a/openembedded/conf/distro/openzaurus-3.5.4.conf
+++ b/openembedded/conf/distro/openzaurus-3.5.4.conf
@@ -1,4 +1,4 @@
1include conf/distro/openzaurus.conf 1include conf/distro/openzaurus.inc
2DISTRO = "openzaurus" 2DISTRO = "openzaurus"
3DISTRO_NAME = "OpenZaurus" 3DISTRO_NAME = "OpenZaurus"
4DISTRO_VERSION = "3.5.3-snapshot-${DATE}" 4DISTRO_VERSION = "3.5.3-snapshot-${DATE}"
@@ -27,6 +27,16 @@ KERNEL_CONSOLE = "ttyS0"
27#DEBUG_BUILD = "1" 27#DEBUG_BUILD = "1"
28#INHIBIT_PACKAGE_STRIP = "1" 28#INHIBIT_PACKAGE_STRIP = "1"
29 29
30PREFERRED_VERSION_gcc-cross ?= "3.4.4"
31PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
32
33PREFERRED_VERSION_hostap-modules ?= "0.3.9"
34
35#fix some iconv issues, needs to be adjusted when doing uclibc builds
36PREFERRED_PROVIDER_virtual/libiconv=glibc
37PREFERRED_PROVIDER_virtual/libintl=glibc
38
39
30# 40#
31# Base 41# Base
32# 42#
@@ -48,12 +58,11 @@ include conf/distro/preferred-opie-versions.inc
48# 58#
49PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" 59PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
50PREFERRED_PROVIDER_x11 = "diet-x11" 60PREFERRED_PROVIDER_x11 = "diet-x11"
51#PREFERRED_PROVIDER_x11 = "x11"
52include conf/distro/preferred-gpe-versions-2.7.inc 61include conf/distro/preferred-gpe-versions-2.7.inc
53 62
54# 63#
55# E 64# E
56# 65#
57include conf/distro/preferred-e-versions.inc 66#include conf/distro/preferred-e-versions.inc
58 67
59include conf/distro/poky-additions.inc \ No newline at end of file 68include conf/distro/poky-additions.inc \ No newline at end of file
diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.inc
index 9208aeda09..9208aeda09 100644
--- a/openembedded/conf/distro/openzaurus.conf
+++ b/openembedded/conf/distro/openzaurus.inc
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
index 5919f351fb..4a3078240a 100644
--- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
@@ -7,13 +7,14 @@
7 7
8#set some preferred providers: 8#set some preferred providers:
9PREFERRED_PROVIDER_gconf=gconf-dbus 9PREFERRED_PROVIDER_gconf=gconf-dbus
10PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
10 11
11#specify versions, as the header says :) 12#specify versions, as the header says :)
12PREFERRED_VERSION_libmatchbox ?= "1.7" 13PREFERRED_VERSION_libmatchbox ?= "1.7"
13PREFERRED_VERSION_matchbox ?= "0.9.1" 14PREFERRED_VERSION_matchbox ?= "0.9.1"
14PREFERRED_VERSION_matchbox-common ?= "0.9.1" 15PREFERRED_VERSION_matchbox-common ?= "0.9.1"
15PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" 16PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
16PREFERRED_VERSION_matchbox-wm ?= "0.9.5" 17PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
17PREFERRED_VERSION_matchbox-panel ?= "0.9.2" 18PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
18PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" 19PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
19PREFERRED_VERSION_atk ?= "1.9.0" 20PREFERRED_VERSION_atk ?= "1.9.0"
@@ -49,7 +50,7 @@ PREFERRED_VERSION_gpe-today ?= "0.09"
49PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" 50PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
50PREFERRED_VERSION_dbus ?= "0.23.4" 51PREFERRED_VERSION_dbus ?= "0.23.4"
51PREFERRED_VERSION_gpe-beam ?= "0.2.8" 52PREFERRED_VERSION_gpe-beam ?= "0.2.8"
52PREFERRED_VERSION_gpe-bluetooth ?= "0.44" 53PREFERRED_VERSION_gpe-bluetooth ?= "0.45"
53PREFERRED_VERSION_gpe-su ?= "0.18" 54PREFERRED_VERSION_gpe-su ?= "0.18"
54PREFERRED_VERSION_gpe-conf ?= "0.1.25" 55PREFERRED_VERSION_gpe-conf ?= "0.1.25"
55PREFERRED_VERSION_gpe-clock ?= "0.21" 56PREFERRED_VERSION_gpe-clock ?= "0.21"
@@ -86,7 +87,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
86PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" 87PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
87PREFERRED_VERSION_linphone ?= "0.12.2" 88PREFERRED_VERSION_linphone ?= "0.12.2"
88PREFERRED_VERSION_firefox ?= "1.0" 89PREFERRED_VERSION_firefox ?= "1.0"
89PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1" 90PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
90PREFERRED_VERSION_poppler ?= "0.3.3" 91PREFERRED_VERSION_poppler ?= "0.3.3"
91PREFERRED_VERSION_evince ?= "0.3.2" 92PREFERRED_VERSION_evince ?= "0.3.2"
92PREFERRED_VERSION_gpe_mini_browser ?= "0.15" 93PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
diff --git a/openembedded/conf/local.conf.sample b/openembedded/conf/local.conf.sample
index 52a0d5f120..49b66b2e50 100644
--- a/openembedded/conf/local.conf.sample
+++ b/openembedded/conf/local.conf.sample
@@ -3,6 +3,7 @@
3# This file is not used, see build/conf/local.conf instead 3# This file is not used, see build/conf/local.conf instead
4# 4#
5# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 5# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
6
6# 7#
7# OpenEmbedded local configuration file (sample) 8# OpenEmbedded local configuration file (sample)
8# 9#
@@ -25,12 +26,11 @@
25# expansion. Stuff like starting with ${HOME} or ${TOPDIR} is ok). 26# expansion. Stuff like starting with ${HOME} or ${TOPDIR} is ok).
26 27
27# Use this to specify where BitBake should place the downloaded sources into 28# Use this to specify where BitBake should place the downloaded sources into
28DL_DIR = "POKYROOT/sources" 29DL_DIR = "${HOME}/sources"
29 30
30# Delete the line below. Then specify which .bb files to consider for 31# Delete the line below. Then specify which .bb files to consider for
31# your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb" 32# your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb"
32#BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}" 33BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
33BBFILES := "POKYROOT/openembedded/packages/*/*.bb"
34 34
35# Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files 35# Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files
36# This is a regulary expression, so be sure to get your parenthesis balanced. 36# This is a regulary expression, so be sure to get your parenthesis balanced.
@@ -77,7 +77,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
77 77
78# Uncomment this to select a distribution policy. See the conf directory 78# Uncomment this to select a distribution policy. See the conf directory
79# for distributions currently known to OpenEmbedded. 79# for distributions currently known to OpenEmbedded.
80# DISTRO = "familiar" 80# Stay away from unversioned distros unless you really know what you are doing
81# DISTRO = "familiar-0.8.3"
81 82
82# Uncomment this to select a particular kernel version if supported by 83# Uncomment this to select a particular kernel version if supported by
83# your MACHINE setting. Currently only supported on Zaurus Clamshells. 84# your MACHINE setting. Currently only supported on Zaurus Clamshells.
@@ -88,7 +89,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
88# INHERIT = "package_ipk" 89# INHERIT = "package_ipk"
89# INHERIT = "package_tar" 90# INHERIT = "package_tar"
90 91
91# Add the required image file system types below. Valid are jffs2, tar, cramfs 92# Add the required image file system types below. Valid are jffs2, tar, cramfs and ext2
92IMAGE_FSTYPES = "jffs2 tar" 93IMAGE_FSTYPES = "jffs2 tar"
93 94
94# Uncomment this to disable the parse cache (not recommended). 95# Uncomment this to disable the parse cache (not recommended).
@@ -97,7 +98,8 @@ IMAGE_FSTYPES = "jffs2 tar"
97# Uncomment this if you want BitBake to emit debugging output 98# Uncomment this if you want BitBake to emit debugging output
98# BBDEBUG = "yes" 99# BBDEBUG = "yes"
99 100
100# Uncomment these two if you want BitBake to build images useful for debugging. 101# Uncomment these two if you want BitBake to build images useful for debugging.
102# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined
101# DEBUG_BUILD = "1" 103# DEBUG_BUILD = "1"
102# INHIBIT_PACKAGE_STRIP = "1" 104# INHIBIT_PACKAGE_STRIP = "1"
103 105
@@ -125,4 +127,4 @@ BBINCLUDELOGS = "yes"
125CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" 127CVS_TARBALL_STASH = "http://www.oesources.org/source/current/"
126 128
127# EDIT THIS FILE and then remove the line below before using! 129# EDIT THIS FILE and then remove the line below before using!
128#REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}" 130REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index 0565b897b7..ec2b1beb02 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -5,6 +5,7 @@
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700" 6IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
7PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" 7PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
8PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
8 9
9PREFERRED_VERSION_orinoco-modules = "0.15rc1" 10PREFERRED_VERSION_orinoco-modules = "0.15rc1"
10 11
@@ -24,14 +25,14 @@ include conf/machine/ipaq-common.conf
24include conf/machine/handheld-common.conf 25include conf/machine/handheld-common.conf
25 26
26GUI_MACHINE_CLASS = "bigscreen" 27GUI_MACHINE_CLASS = "bigscreen"
27GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-filemanager gpe-nmf evince" 28GPE_EXTRA_DEPENDS += "gaim sylpheed"
28GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince" 29GPE_EXTRA_INSTALL += "gaim sylpheed"
29 30
30# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. 31# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
31include conf/machine/tune-xscale.conf 32include conf/machine/tune-xscale.conf
32 33
33BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" 34BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
34HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ 35HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
35 hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power" 36 hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
36 37
37module_autoload_hx4700_power = "hx4700_power" 38module_autoload_hx4700_power = "hx4700_power"
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
index 6e6ea7f605..79ce0c4193 100644
--- a/openembedded/conf/machine/spitz.conf
+++ b/openembedded/conf/machine/spitz.conf
@@ -15,6 +15,6 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
15BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" 15BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs"
16BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" 16BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
17 17
18IMAGE_FSTYPES = "jffs2 tar" 18IMAGE_FSTYPES = "jffs2 tar.gz"
19 19
20ROOT_FLASH_SIZE = "100" 20ROOT_FLASH_SIZE = "100"
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/zaurus-clamshell-2.6.conf
index 516b07ee15..a26ae7754f 100644
--- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf
+++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf
@@ -2,13 +2,12 @@
2# Don't forget to include zaurus-clamshell.conf as well 2# Don't forget to include zaurus-clamshell.conf as well
3 3
4PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" 4PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
5PREFERRED_VERSION_orinoco-modules = "0.15rc1"
6 5
7BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ 6BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules spectrum-fw \
8pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ 7pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
9ppp ppp-dialin openswan wpa-supplicant-nossl" 8ppp ppp-dialin openswan wpa-supplicant-nossl"
10 9
11BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \ 10BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs spectrum-fw \
12pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ 11pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
13ppp ppp-dialin openswan wpa-supplicant-nossl" 12ppp ppp-dialin openswan wpa-supplicant-nossl"
14 13
@@ -34,3 +33,5 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-
34BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ 33BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
35 kernel-module-g-serial kernel-module-g-ether" 34 kernel-module-g-serial kernel-module-g-ether"
36 35
36# Wireless Modules
37BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-orinoco-cs kernel-module-spectrum-cs"
diff --git a/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab b/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
index 8c38a5fda2..3dfde917e6 100644
--- a/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
+++ b/openembedded/packages/base-files/base-files/ipaq-pxa270/fstab
@@ -4,6 +4,6 @@
4proc /proc proc defaults 0 0 4proc /proc proc defaults 0 0
5sys /sys sysfs defaults 0 0 5sys /sys sysfs defaults 0 0
6 6
7/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 7/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0
8tmpfs /var tmpfs defaults 0 0 8tmpfs /var tmpfs defaults 0 0
9tmpfs /media/ram tmpfs defaults 0 0 9tmpfs /media/ram tmpfs defaults 0 0
diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb
index e2c1003c58..d63c38ab83 100644
--- a/openembedded/packages/base-files/base-files_3.0.14.bb
+++ b/openembedded/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Miscellaneous files for the base system." 1DESCRIPTION = "Miscellaneous files for the base system."
2SECTION = "base" 2SECTION = "base"
3PRIORITY = "required" 3PRIORITY = "required"
4PR = "r40" 4PR = "r41"
5LICENSE = "GPL" 5LICENSE = "GPL"
6 6
7SRC_URI = " \ 7SRC_URI = " \
diff --git a/openembedded/packages/binutils/binutils.inc b/openembedded/packages/binutils/binutils.inc
index e544e9ef53..680e579a06 100644
--- a/openembedded/packages/binutils/binutils.inc
+++ b/openembedded/packages/binutils/binutils.inc
@@ -48,14 +48,14 @@ export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
48export NM_FOR_TARGET = "${TARGET_PREFIX}nm" 48export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
49export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib" 49export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
50 50
51export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc" 51export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
52export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc" 52export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
53 53
54export CC_FOR_BUILD = "${BUILD_CC}" 54export CC_FOR_BUILD = "${BUILD_CC}"
55export CPP_FOR_BUILD = "${BUILD_CPP}" 55export CPP_FOR_BUILD = "${BUILD_CPP}"
56export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" 56export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
57 57
58export CC = "${CCACHE} ${HOST_PREFIX}gcc" 58export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
59 59
60do_configure () { 60do_configure () {
61 (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" 61 (cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
diff --git a/openembedded/packages/db/db_4.3.27.bb b/openembedded/packages/db/db_4.3.27.bb
index 216fb5714b..518fddee9f 100644
--- a/openembedded/packages/db/db_4.3.27.bb
+++ b/openembedded/packages/db/db_4.3.27.bb
@@ -69,7 +69,7 @@ do_configure() {
69 69
70do_stage() { 70do_stage() {
71 # The .h files get installed read-only, the autostage 71 # The .h files get installed read-only, the autostage
72 # function just uses cp -a, so do this by hand 72 # function just uses cp -pPR, so do this by hand
73 # Install, for the moment, into include/db4 to avoid 73 # Install, for the moment, into include/db4 to avoid
74 # interfering with the db3 headers (which have the same 74 # interfering with the db3 headers (which have the same
75 # name). -I${STAGING_INCDIR}/db4 to use db4, as opposed 75 # name). -I${STAGING_INCDIR}/db4 to use db4, as opposed
@@ -78,7 +78,7 @@ do_stage() {
78 mkdir -p ${STAGE_TEMP} 78 mkdir -p ${STAGE_TEMP}
79 oe_runmake DESTDIR="${STAGE_TEMP}" install_include 79 oe_runmake DESTDIR="${STAGE_TEMP}" install_include
80 mkdir -p ${STAGING_INCDIR}/db4 80 mkdir -p ${STAGING_INCDIR}/db4
81 cp -af ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4 81 cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
82 rm -rf ${STAGE_TEMP} 82 rm -rf ${STAGE_TEMP}
83 oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR} 83 oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
84} 84}
diff --git a/openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb b/openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb
index 0d64e32c1c..48c80864e2 100644
--- a/openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb
+++ b/openembedded/packages/gcc/gcc-cross-initial_3.4.3.bb
@@ -1,6 +1,7 @@
1include gcc-cross_${PV}.bb 1include gcc-cross_${PV}.bb
2 2
3DEPENDS = "virtual/${TARGET_PREFIX}binutils ${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" 3DEPENDS = "virtual/${TARGET_PREFIX}binutils"
4DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
4PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" 5PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
5PACKAGES = "" 6PACKAGES = ""
6 7
diff --git a/openembedded/packages/hostap/hostap-modules-0.3.9/Makefile.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/Makefile.patch
new file mode 100644
index 0000000000..2fc5e9ed4b
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/Makefile.patch
@@ -0,0 +1,11 @@
1--- hostap-driver-0.2.4/Makefile.old 2004-07-31 10:35:50.000000000 +0100
2+++ hostap-driver-0.2.4/Makefile 2004-07-31 10:35:56.000000000 +0100
3@@ -51,7 +51,7 @@
4
5 VERFILE := $(KERNEL_PATH)/include/linux/version.h
6 KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \
7- then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \
8+ then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \
9 else uname -r; fi)
10 KERNELVER := $(shell echo "$(KERNELRELEASE)" | \
11 sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/")
diff --git a/openembedded/packages/hostap/hostap-modules-0.3.9/add_event.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/add_event.patch
new file mode 100644
index 0000000000..d5f2a10e86
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/add_event.patch
@@ -0,0 +1,28 @@
1Index: hostap-driver-0.3.7/driver/modules/hostap_cs.c
2===================================================================
3--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-08-03 17:05:53.000000000 +0100
4+++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-08-03 17:07:59.000000000 +0100
5@@ -526,11 +526,13 @@
6 dev_list = link;
7 client_reg.dev_info = &dev_info;
8 client_reg.Attributes = INFO_IO_CLIENT;
9+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13))
10 client_reg.EventMask = CS_EVENT_CARD_INSERTION |
11 CS_EVENT_CARD_REMOVAL |
12 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
13 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
14 client_reg.event_handler = &prism2_event;
15+#endif
16 client_reg.Version = 0x0210;
17 client_reg.event_callback_args.client_data = link;
18 ret = pcmcia_register_client(&link->handle, &client_reg);
19@@ -913,6 +915,9 @@
20 .name = "hostap_cs",
21 },
22 .attach = prism2_attach,
23+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
24+ .event = prism2_event,
25+#endif
26 .detach = prism2_detach,
27 .owner = THIS_MODULE,
28 };
diff --git a/openembedded/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch
new file mode 100644
index 0000000000..c29cc8d2c9
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch
@@ -0,0 +1,77 @@
1diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap.c hostap-driver-0.3.7/driver/modules/hostap.c
2--- hostap-driver-0.3.7.orig/driver/modules/hostap.c 2005-07-25 09:14:01.995965088 +0000
3+++ hostap-driver-0.3.7/driver/modules/hostap.c 2005-07-25 09:13:22.301999488 +0000
4@@ -25,6 +25,7 @@
5 #include <linux/if_arp.h>
6 #include <linux/delay.h>
7 #include <linux/random.h>
8+#include <linux/utsname.h>
9 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
10 #include <linux/tqueue.h>
11 #else
12diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c
13--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:14:01.996964936 +0000
14+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:13:22.302999336 +0000
15@@ -19,6 +19,7 @@
16 #include <linux/netdevice.h>
17 #include <linux/if_ether.h>
18 #include <linux/if_arp.h>
19+#include <linux/utsname.h>
20 #include <asm/string.h>
21
22 #include "hostap_crypt.h"
23diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c
24--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:14:01.996964936 +0000
25+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:13:22.302999336 +0000
26@@ -19,6 +19,7 @@
27 #include <linux/netdevice.h>
28 #include <linux/if_ether.h>
29 #include <linux/if_arp.h>
30+#include <linux/utsname.h>
31 #include <asm/string.h>
32
33 #include "hostap_crypt.h"
34diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c
35--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c 2005-07-25 09:14:01.996964936 +0000
36+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c 2005-07-25 09:13:22.302999336 +0000
37@@ -15,6 +15,7 @@
38 #include <linux/init.h>
39 #include <linux/slab.h>
40 #include <linux/random.h>
41+#include <linux/utsname.h>
42 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
43 #include <linux/tqueue.h>
44 #else
45diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c hostap-driver-0.3.7/driver/modules/hostap_cs.c
46--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-07-25 09:14:01.997964784 +0000
47+++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-07-25 09:13:22.302999336 +0000
48@@ -12,6 +12,7 @@
49 #include <linux/timer.h>
50 #include <linux/skbuff.h>
51 #include <linux/netdevice.h>
52+#include <linux/utsname.h>
53 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
54 #include <linux/tqueue.h>
55 #else
56diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c hostap-driver-0.3.7/driver/modules/hostap_pci.c
57--- hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c 2005-07-25 09:14:01.997964784 +0000
58+++ hostap-driver-0.3.7/driver/modules/hostap_pci.c 2005-07-25 09:13:22.303999184 +0000
59@@ -11,6 +11,7 @@
60 #include <linux/if.h>
61 #include <linux/skbuff.h>
62 #include <linux/netdevice.h>
63+#include <linux/utsname.h>
64 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
65 #include <linux/tqueue.h>
66 #else
67diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c hostap-driver-0.3.7/driver/modules/hostap_plx.c
68--- hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c 2005-07-25 09:14:01.997964784 +0000
69+++ hostap-driver-0.3.7/driver/modules/hostap_plx.c 2005-07-25 09:13:22.303999184 +0000
70@@ -14,6 +14,7 @@
71 #include <linux/if.h>
72 #include <linux/skbuff.h>
73 #include <linux/netdevice.h>
74+#include <linux/utsname.h>
75 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
76 #include <linux/tqueue.h>
77 #else
diff --git a/openembedded/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch
new file mode 100644
index 0000000000..05f716e22f
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch
@@ -0,0 +1,70 @@
1Index: hostap-driver-0.3.9/driver/modules/hostap_cs.c
2===================================================================
3--- hostap-driver-0.3.9.orig/driver/modules/hostap_cs.c 2005-08-24 10:11:47.000000000 +0100
4+++ hostap-driver-0.3.9/driver/modules/hostap_cs.c 2005-08-24 10:39:10.000000000 +0100
5@@ -908,6 +908,57 @@
6 return 0;
7 }
8
9+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
10+static struct pcmcia_device_id hostap_cs_ids[] = {
11+ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
12+ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
13+ PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
14+ PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
15+ PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
16+ PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
17+ PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
18+ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
19+ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),
20+ PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
21+ PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
22+ PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
23+ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
24+ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
25+ PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
26+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
27+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
28+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
29+ PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
30+ 0x7a954bd9, 0x74be00c6),
31+ PCMCIA_DEVICE_PROD_ID1234(
32+ "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
33+ "Eval-RevA",
34+ 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
35+ PCMCIA_DEVICE_PROD_ID123(
36+ "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
37+ 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
38+ PCMCIA_DEVICE_PROD_ID123(
39+ "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
40+ 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
41+ PCMCIA_DEVICE_PROD_ID123(
42+ "Instant Wireless ", " Network PC CARD", "Version 01.02",
43+ 0x11d901af, 0x6e9bd926, 0x4b74baa0),
44+ PCMCIA_DEVICE_PROD_ID123(
45+ "SMC", "SMC2632W", "Version 01.02",
46+ 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
47+ PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
48+ 0x54f7c49c, 0x15a75e5b),
49+ PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
50+ 0x74c5e40d, 0xdb472a18),
51+ PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
52+ 0x0733cc81, 0x0c52f395),
53+ PCMCIA_DEVICE_PROD_ID12(
54+ "ZoomAir 11Mbps High", "Rate wireless Networking",
55+ 0x273fe3db, 0x32a1eaee),
56+ PCMCIA_DEVICE_NULL
57+};
58+MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
59+#endif
60
61 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67)
62 static struct pcmcia_driver hostap_driver = {
63@@ -917,6 +968,7 @@
64 .attach = prism2_attach,
65 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
66 .event = prism2_event,
67+ .id_table = hostap_cs_ids,
68 #endif
69 .detach = prism2_detach,
70 .owner = THIS_MODULE,
diff --git a/openembedded/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch b/openembedded/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch
index b139ef38f1..b139ef38f1 100644
--- a/openembedded/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch
diff --git a/openembedded/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff b/openembedded/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff
index c2d6662d69..c2d6662d69 100644
--- a/openembedded/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff
diff --git a/openembedded/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff b/openembedded/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff
index e979b72d93..e979b72d93 100644
--- a/openembedded/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff
+++ b/openembedded/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff
diff --git a/openembedded/packages/hostap/hostap-modules_0.4.4.bb b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
index fd7a3eaff9..1be1e6a77e 100644
--- a/openembedded/packages/hostap/hostap-modules_0.4.4.bb
+++ b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
@@ -3,10 +3,14 @@ SECTION = "kernel/modules"
3PRIORITY = "optional" 3PRIORITY = "optional"
4MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" 4MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r4"
6 7
7SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ 8SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
8 file://hostap_cs.conf " 9 file://hostap_cs.conf \
9 10 file://Makefile.patch;patch=1 \
11 file://add_event.patch;patch=1 \
12 file://hostap-utsname.patch;patch=1 \
13 file://hostap_cardid.patch;patch=1"
10SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ 14SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
11 file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" 15 file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
12SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " 16SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
diff --git a/openembedded/packages/initscripts/initscripts_1.0.bb b/openembedded/packages/initscripts/initscripts_1.0.bb
index 4c92d07130..2ad0197a75 100644
--- a/openembedded/packages/initscripts/initscripts_1.0.bb
+++ b/openembedded/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
6DEPENDS_openzaurus = "makedevs virtual/kernel" 6DEPENDS_openzaurus = "makedevs virtual/kernel"
7RDEPENDS = "makedevs" 7RDEPENDS = "makedevs"
8LICENSE = "GPL" 8LICENSE = "GPL"
9PR = "r57" 9PR = "r58"
10 10
11SRC_URI = "file://halt \ 11SRC_URI = "file://halt \
12 file://ramdisk \ 12 file://ramdisk \
@@ -41,6 +41,8 @@ SRC_URI_append_tosa = " file://keymap-*.map"
41SRC_URI_append_akita = " file://keymap-*.map" 41SRC_URI_append_akita = " file://keymap-*.map"
42SRC_URI_append_spitz = " file://keymap-*.map" 42SRC_URI_append_spitz = " file://keymap-*.map"
43SRC_URI_append_borzoi = " file://keymap-*.map" 43SRC_URI_append_borzoi = " file://keymap-*.map"
44SRC_URI_append_collie = " file://keymap-*.map"
45SRC_URI_append_poodle = " file://keymap-*.map"
44 46
45def read_kernel_version(d): 47def read_kernel_version(d):
46 import bb 48 import bb
@@ -103,7 +105,7 @@ do_install () {
103 fi 105 fi
104 106
105 case ${MACHINE} in 107 case ${MACHINE} in
106 c7x0 | tosa | spitz | akita | borzoi ) 108 c7x0 | tosa | spitz | akita | borzoi | collie | poodle )
107 install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d 109 install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d
108 ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap 110 ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap
109 install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} 111 install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir}
diff --git a/openembedded/packages/irda-utils/irda-utils_0.9.16.bb b/openembedded/packages/irda-utils/irda-utils_0.9.16.bb
index d99846f8cd..2e09edd841 100644
--- a/openembedded/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/openembedded/packages/irda-utils/irda-utils_0.9.16.bb
@@ -10,6 +10,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
10 file://m4.patch;patch=1 \ 10 file://m4.patch;patch=1 \
11 file://init" 11 file://init"
12 12
13export SYS_INCLUDES="-I${STAGING_INCDIR}"
14
13inherit autotools update-rc.d 15inherit autotools update-rc.d
14 16
15INITSCRIPT_NAME = "irattach" 17INITSCRIPT_NAME = "irattach"
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch b/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch
deleted file mode 100644
index e97650a9de..0000000000
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- /dev/null 2004-06-02 16:28:12.000000000 -0500
7+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh4/sigcontext.h 2004-08-27 17:56:59.000000000 -0500
8@@ -0,0 +1,24 @@
9+#ifndef __ASM_CPU_SH4_SIGCONTEXT_H
10+#define __ASM_CPU_SH4_SIGCONTEXT_H
11+
12+struct sigcontext {
13+ unsigned long oldmask;
14+
15+ /* CPU registers */
16+ unsigned long sc_regs[16];
17+ unsigned long sc_pc;
18+ unsigned long sc_pr;
19+ unsigned long sc_sr;
20+ unsigned long sc_gbr;
21+ unsigned long sc_mach;
22+ unsigned long sc_macl;
23+
24+ /* FPU registers */
25+ unsigned long sc_fpregs[16];
26+ unsigned long sc_xfpregs[16];
27+ unsigned int sc_fpscr;
28+ unsigned int sc_fpul;
29+ unsigned int sc_ownedfp;
30+};
31+
32+#endif /* __ASM_CPU_SH4_SIGCONTEXT_H */
33--- /dev/null 2004-06-02 16:28:12.000000000 -0500
34+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh2/sigcontext.h 2004-08-27 17:57:54.000000000 -0500
35@@ -0,0 +1,17 @@
36+#ifndef __ASM_CPU_SH2_SIGCONTEXT_H
37+#define __ASM_CPU_SH2_SIGCONTEXT_H
38+
39+struct sigcontext {
40+ unsigned long oldmask;
41+
42+ /* CPU registers */
43+ unsigned long sc_regs[16];
44+ unsigned long sc_pc;
45+ unsigned long sc_pr;
46+ unsigned long sc_sr;
47+ unsigned long sc_gbr;
48+ unsigned long sc_mach;
49+ unsigned long sc_macl;
50+};
51+
52+#endif /* __ASM_CPU_SH2_SIGCONTEXT_H */
53--- /dev/null 2004-06-02 16:28:12.000000000 -0500
54+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh3/sigcontext.h 2004-08-27 17:57:58.000000000 -0500
55@@ -0,0 +1,17 @@
56+#ifndef __ASM_CPU_SH3_SIGCONTEXT_H
57+#define __ASM_CPU_SH3_SIGCONTEXT_H
58+
59+struct sigcontext {
60+ unsigned long oldmask;
61+
62+ /* CPU registers */
63+ unsigned long sc_regs[16];
64+ unsigned long sc_pc;
65+ unsigned long sc_pr;
66+ unsigned long sc_sr;
67+ unsigned long sc_gbr;
68+ unsigned long sc_mach;
69+ unsigned long sc_macl;
70+};
71+
72+#endif /* __ASM_CPU_SH3_SIGCONTEXT_H */
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff b/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff
deleted file mode 100644
index a06b5affd9..0000000000
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff
+++ /dev/null
@@ -1,11 +0,0 @@
1--- include/asm-mips/atomic.h.orig 2004-10-01 10:10:05.487734944 +0200
2+++ include/asm-mips/atomic.h 2004-10-01 10:10:15.837161592 +0200
3@@ -15,8 +15,6 @@
4 #define _ASM_ATOMIC_H
5
6
7-#include <asm/system.h>
8-
9 typedef struct { volatile int counter; } atomic_t;
10 typedef struct { volatile __s64 counter; } atomic64_t;
11
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index c7d6367c7b..65e3f8b25b 100644
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -36,11 +36,11 @@ do_configure () {
36 if test ! -e include/asm-$ARCH; then 36 if test ! -e include/asm-$ARCH; then
37 oefatal unable to create asm symlink in kernel headers 37 oefatal unable to create asm symlink in kernel headers
38 fi 38 fi
39 cp -a "include/asm-$ARCH" "include/asm" 39 cp -pPR "include/asm-$ARCH" "include/asm"
40 if test "$ARCH" = "arm"; then 40 if test "$ARCH" = "arm"; then
41 cp -a include/asm/arch-ebsa285 include/asm/arch 41 cp -pPR include/asm/arch-ebsa285 include/asm/arch
42 elif test "$ARCH" = "sh"; then 42 elif test "$ARCH" = "sh"; then
43 cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu" 43 cp -pPR include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
44 fi 44 fi
45} 45}
46 46
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
deleted file mode 100644
index f881d38a34..0000000000
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
+++ /dev/null
@@ -1,56 +0,0 @@
1SECTION = "devel"
2DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
3MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
4INHIBIT_DEFAULT_DEPS = "1"
5PR = "r3"
6LICENSE = "GPL"
7# NOTE: no need to package these headers, since the c library includes them.
8PACKAGES = ""
9
10SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
11 file://sh-missing.patch;patch=1 \
12 file://keyboard.patch;patch=1"
13S = "${WORKDIR}/linux-libc-headers-${PV}"
14
15do_configure () {
16 case ${TARGET_ARCH} in
17 alpha*) ARCH=alpha ;;
18 arm*) ARCH=arm ;;
19 cris*) ARCH=cris ;;
20 hppa*) ARCH=parisc ;;
21 i*86*) ARCH=i386 ;;
22 ia64*) ARCH=ia64 ;;
23 mips*) ARCH=mips ;;
24 m68k*) ARCH=m68k ;;
25 powerpc*) ARCH=ppc ;;
26 s390*) ARCH=s390 ;;
27 sh*) ARCH=sh ;;
28 sparc64*) ARCH=sparc64 ;;
29 sparc*) ARCH=sparc ;;
30 x86_64*) ARCH=x86_64 ;;
31 esac
32 if test ! -e include/asm-$ARCH; then
33 oefatal unable to create asm symlink in kernel headers
34 fi
35 cp -a "include/asm-$ARCH" "include/asm"
36 if test "$ARCH" = "arm"; then
37 cp -a include/asm/arch-ebsa285 include/asm/arch
38 elif test "$ARCH" = "sh"; then
39 cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
40 fi
41}
42
43do_stage () {
44 install -d ${STAGING_INCDIR}
45 rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
46 cp -pfLR include/linux ${STAGING_INCDIR}/
47 cp -pfLR include/asm ${STAGING_INCDIR}/
48 rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
49 rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
50 install -d ${CROSS_DIR}/${TARGET_SYS}/include
51 cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
52 cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
53
54 ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${STAGING_INCDIR}/linux/wireless.h
55 ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${CROSS_DIR}/${TARGET_SYS}/include/linux/wireless.h
56}
diff --git a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
deleted file mode 100644
index c127e8a9e7..0000000000
--- a/openembedded/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
+++ /dev/null
@@ -1,61 +0,0 @@
1SECTION = "devel"
2DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
3HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
4# license note from the package:
5# Linux-libc-headers are derived from linux kernel headers. For license of a
6# particular header, check it's content, and if copyright notice isn't present,
7# standard linux kernel license applies.
8# since we assume GPL for linux i think we can also assume it here
9LICENSE = "GPL"
10MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
11INHIBIT_DEFAULT_DEPS = "1"
12PR = "r7"
13
14# NOTE: no need to package these headers, since the c library includes them.
15PACKAGES = ""
16
17SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
18 file://mips-asm-atomic-system.diff;patch=1;pnum=0 \
19 file://keyboard.patch;patch=1"
20
21S = "${WORKDIR}/linux-libc-headers-${PV}"
22
23do_configure () {
24 case ${TARGET_ARCH} in
25 alpha*) ARCH=alpha ;;
26 arm*) ARCH=arm ;;
27 cris*) ARCH=cris ;;
28 hppa*) ARCH=parisc ;;
29 i*86*) ARCH=i386 ;;
30 ia64*) ARCH=ia64 ;;
31 mips*) ARCH=mips ;;
32 m68k*) ARCH=m68k ;;
33 powerpc*) ARCH=ppc ;;
34 s390*) ARCH=s390 ;;
35 sh*) ARCH=sh ;;
36 sparc64*) ARCH=sparc64 ;;
37 sparc*) ARCH=sparc ;;
38 x86_64*) ARCH=x86_64 ;;
39 esac
40 if test ! -e include/asm-$ARCH; then
41 oefatal unable to create asm symlink in kernel headers
42 fi
43 cp -a "include/asm-$ARCH" "include/asm"
44 if test "$ARCH" = "arm"; then
45 cp -a include/asm/arch-ebsa285 include/asm/arch
46 elif test "$ARCH" = "sh"; then
47 cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
48 fi
49}
50
51do_stage () {
52 install -d ${STAGING_INCDIR}
53 rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
54 cp -pfLR include/linux ${STAGING_INCDIR}/
55 cp -pfLR include/asm ${STAGING_INCDIR}/
56 rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
57 rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
58 install -d ${CROSS_DIR}/${TARGET_SYS}/include
59 cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
60 cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
61}
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
index fdf38d6e68..d747243740 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common" 4DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
5RDEPENDS = "matchbox-common" 5RDEPENDS = "matchbox-common"
6PV = "0.9cvs${CVSDATE}" 6PV = "0.9.5+cvs-${CVSDATE}"
7PR = "r1" 7PR = "r1"
8DEFAULT_PREFERENCE = "-1" 8DEFAULT_PREFERENCE = "-1"
9 9
diff --git a/openembedded/packages/module-init-tools/module-init-tools_3.1.bb b/openembedded/packages/module-init-tools/module-init-tools_3.1.bb
deleted file mode 100644
index 62523f513a..0000000000
--- a/openembedded/packages/module-init-tools/module-init-tools_3.1.bb
+++ /dev/null
@@ -1,60 +0,0 @@
1LICENSE = "GPL"
2SECTION = "base"
3DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
4removing kernel modules for Linux (versions 2.5.48 and above). It serves \
5the same function that the modutils package serves for Linux 2.4."
6PR = "r2"
7
8PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
9RDEPENDS_${PN} += "module-init-tools-depmod"
10
11FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
12FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
13
14SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
15 file://ignore_arch_directory;patch=1 \
16 file://modutils_extension;patch=1 \
17 file://no_man_rebuild;patch=1 \
18 file://manpagesopt;patch=1 \
19 file://soc.patch;patch=1;pnum=0"
20S = "${WORKDIR}/module-init-tools-${PV}"
21
22EXTRA_OECONF = "--disable-manpages"
23
24bindir = "/bin"
25sbindir = "/sbin"
26
27inherit autotools
28
29do_install() {
30 autotools_do_install
31 for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
32 mv ${D}/$f ${D}/$f.26
33 done
34}
35
36pkg_postinst_module-init-tools() {
37#!/bin/sh
38for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
39bn=`basename $f`
40 update-alternatives --install /$f $bn /$f.26 20
41done
42}
43
44pkg_prerm_module-init-tools() {
45#!/bin/sh
46for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
47bn=`basename $f`
48 update-alternatives --remove $bn /$f.26
49done
50}
51
52pkg_postinst_module-init-tools-depmod() {
53#!/bin/sh
54update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
55}
56
57pkg_prerm_module-init-tools() {
58#!/bin/sh
59update-alternatives --remove depmod /sbin/depmod.26
60}
diff --git a/openembedded/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/openembedded/packages/module-init-tools/module-init-tools_3.2-pre7.bb
index 41aea223fe..017f288e7d 100644
--- a/openembedded/packages/module-init-tools/module-init-tools_3.2-pre7.bb
+++ b/openembedded/packages/module-init-tools/module-init-tools_3.2-pre7.bb
@@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \
3the same function that the modutils package serves for Linux 2.4." 3the same function that the modutils package serves for Linux 2.4."
4LICENSE = "GPL" 4LICENSE = "GPL"
5SECTION = "base" 5SECTION = "base"
6PR = "r0" 6PR = "r1"
7 7
8PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" 8PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
9RDEPENDS_${PN} += "module-init-tools-depmod" 9RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -34,18 +34,22 @@ do_install() {
34 34
35pkg_postinst_module-init-tools() { 35pkg_postinst_module-init-tools() {
36#!/bin/sh 36#!/bin/sh
37for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do 37for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
38bn=`basename $f` 38bn=`basename $f`
39 update-alternatives --install /$f $bn /$f.26 20 39 update-alternatives --install /$f $bn /$f.26 20
40done 40done
41update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
42update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
41} 43}
42 44
43pkg_prerm_module-init-tools() { 45pkg_prerm_module-init-tools() {
44#!/bin/sh 46#!/bin/sh
45for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do 47for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
46bn=`basename $f` 48bn=`basename $f`
47 update-alternatives --remove $bn /$f.26 49 update-alternatives --remove $bn /$f.26
48done 50done
51update-alternatives --remove bin-lsmod /bin/lsmod.26
52update-alternatives --remove lsmod /bin/lsmod.26
49} 53}
50 54
51pkg_postinst_module-init-tools-depmod() { 55pkg_postinst_module-init-tools-depmod() {
diff --git a/openembedded/packages/orinoco/spectrum-fw.bb b/openembedded/packages/orinoco/spectrum-fw.bb
new file mode 100644
index 0000000000..1d388332a5
--- /dev/null
+++ b/openembedded/packages/orinoco/spectrum-fw.bb
@@ -0,0 +1,20 @@
1DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
2LICENSE = "unknown"
3PR = "r0"
4
5SRC_URI = "file://get_symbol_fw \
6 file://parse_symbol_fw"
7
8S = "${WORKDIR}"
9
10do_compile() {
11 ./get_symbol_fw
12}
13
14FILES_${PN} += "${base_libdir}/firmware/symbol*"
15
16do_install() {
17 install -d ${D}${base_libdir}/firmware/
18 install -m 0755 ${WORKDIR}/symbol_sp24t_prim_fw ${D}${base_libdir}/firmware/symbol_sp24t_prim_fw
19 install -m 0755 ${WORKDIR}/symbol_sp24t_sec_fw ${D}${base_libdir}/firmware/symbol_sp24t_sec_fw
20}
diff --git a/openembedded/packages/orinoco/spectrum-fw/get_symbol_fw b/openembedded/packages/orinoco/spectrum-fw/get_symbol_fw
new file mode 100755
index 0000000000..e7b0bf2d44
--- /dev/null
+++ b/openembedded/packages/orinoco/spectrum-fw/get_symbol_fw
@@ -0,0 +1,43 @@
1#!/bin/sh
2
3# Get firmware for Symbol Spectrum24 Trilogy.
4# Both the header file and the binary firmware files are produced.
5
6# Copyright (C) 2004 Pavel Roskin <proski@gnu.org>
7
8# This script is Free Software, and it can be copied, distributed and
9# modified as defined in the GNU General Public License. A copy of
10# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
11
12# Usage: get_symbol_fw
13# Output: spectrum_fw.h symbol_sp24t_prim_fw symbol_sp24t_sec_fw
14# Needed tools: curl (or wget), unzip, perl.
15
16set -e
17
18URL_BASE='ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/'
19DL_FILE='MC&DriverOnlyInstallers.zip'
20DL_INT1='S24DRVR392B67-01.exe'
21DL_INT2='Driver Only Installer/NetWLan5.sys'
22DRIVER1=symbol1.drv
23DRIVER2=symbol2.drv
24
25get_file() {
26 curl --remote-name "$1" || \
27 wget --passive-ftp "$1" || \
28 wget "$1" || \
29 ftp "$1" </dev/null || \
30 exit 1
31}
32
33if ! test -f $DL_FILE; then
34 get_file $URL_BASE/$DL_FILE
35fi
36
37unzip -p $DL_FILE "$DL_INT1" >$DRIVER1
38unzip -p $DRIVER1 "$DL_INT2" >$DRIVER2
39
40perl parse_symbol_fw $DRIVER2 spectrum_fw.h symbol_sp24t_prim_fw \
41 symbol_sp24t_sec_fw
42
43rm -f $DRIVER1 $DRIVER2 \ No newline at end of file
diff --git a/openembedded/packages/orinoco/spectrum-fw/parse_symbol_fw b/openembedded/packages/orinoco/spectrum-fw/parse_symbol_fw
new file mode 100755
index 0000000000..7fe0ea57c4
--- /dev/null
+++ b/openembedded/packages/orinoco/spectrum-fw/parse_symbol_fw
@@ -0,0 +1,129 @@
1#!/usr/bin/perl -w
2
3# Extract Symbol firmware and convert is to a header file and two binary
4# files.
5
6# Copyright (C) 2004 Pavel Roskin <proski@gnu.org>
7
8# This script is Free Software, and it can be copied, distributed and
9# modified as defined in the GNU General Public License. A copy of
10# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
11
12# Usage:
13# parse_symbol_fw infile header binfile1 binfile2
14
15use strict;
16
17# Print message and exit (like "die", but without raising an exception).
18# Newline is added at the end.
19sub error
20{
21 printf STDERR "ERROR: ";
22 printf STDERR @_;
23 printf STDERR "\n";
24 exit 1;
25}
26
27sub readnum_ba ()
28{
29 my $byte_a;
30 read INFILE,$byte_a,1;
31 my $byte_b;
32 read INFILE,$byte_b,1;
33 return (ord($byte_b) << 8) + ord($byte_a);
34}
35
36
37if ($#ARGV != 3) {
38 error ("Usage: parse_symbol_fw infile header binfile1 binfile2");
39}
40
41unless (open (INFILE, "< $ARGV[0]")) {
42 error ("couldn't open $ARGV[0] for reading: $!");
43}
44
45unless (open (OUTFILE, "> $ARGV[1]")) {
46 error ("couldn't open $ARGV[1] for writing: $!");
47}
48
49# Process one array, either for primary or for secondary firmware
50sub process_one_array($$) {
51 my $arrname = shift(@_);
52 my $binfile = shift(@_);
53 my $offset = -1;
54 my $str_offset = 0;
55
56 # Skip to the beginning of firmware
57 $/ = "\x00";
58 while (<INFILE>) {
59 if (m{FILE: }g) {
60 $offset = $str_offset + pos() - 6;
61 last;
62 }
63 $str_offset = tell(INFILE);
64 }
65
66 if ($offset == -1) {
67 error("Cannot find FILE: marker");
68 }
69
70 my @fwdata = split;
71 print $fwdata[1] . "\n";
72 seek(INFILE, $offset, 0);
73
74 my $blknum = $fwdata[3];
75 my $pdrlen = $fwdata[4];
76 my $crclen = $fwdata[5];
77 my $compatlen = $fwdata[6];
78
79 while (!eof(INFILE)) {
80 my $byte;
81 read INFILE, $byte, 1;
82 last if (ord($byte) == 0x1a);
83 }
84
85 # Walk all blocks
86 my $block = $blknum;
87 while ($block-- > 0) {
88 seek(INFILE, 4, 1);
89 my $len = readnum_ba();
90 seek(INFILE, $len, 1);
91 }
92
93 my $img_len = tell(INFILE) - $offset + $pdrlen + $crclen + $compatlen + 2;
94 seek(INFILE, $offset, 0);
95
96 # Write binary file for the section
97 unless (open (BINFILE, "> $binfile")) {
98 error ("couldn't open $binfile for writing: $!");
99 }
100
101 # Output the array
102 printf OUTFILE "/* %s %s */\n", $fwdata[1], $fwdata[2];
103 printf OUTFILE "static u8 %s[] = {\n", $arrname;
104
105 my $count = 0;
106 while ($count++ < $img_len) {
107 my $byte;
108 read INFILE, $byte, 1;
109 $byte = ord($byte);
110 printf OUTFILE "0x%02x,", $byte;
111 printf BINFILE "%c", $byte;
112 if ($count % 16 == 0) {
113 printf OUTFILE "\n";
114 }
115 }
116
117 if ($img_len % 16) {
118 printf OUTFILE "\n";
119 }
120
121 print OUTFILE "};\n";
122 close(BINFILE);
123}
124
125process_one_array("primsym", $ARGV[2]);
126process_one_array("secsym", $ARGV[3]);
127
128close(INFILE);
129close(OUTFILE);
diff --git a/openembedded/packages/rp1 b/openembedded/packages/rp1
deleted file mode 100644
index 2946898e92..0000000000
--- a/openembedded/packages/rp1
+++ /dev/null
@@ -1,109 +0,0 @@
1apmd-3.2.2-r3
2autoconf-native-2.59-r3
3automake-native-1.9.3-r5
4base-files-3.0.14-r39
5base-passwd-3.5.9-r2
6binutils-cross-2.15.99+csl-arm+cvs20050416-r0
7bison-native-2.0-r2
8busybox-1.00-r30
9compositeext-0.0cvs20050825-r0
10compositeext-0.0cvs20050826-r0
11console-tools-0.3.2-r1
12coreutils-native-5.1.3-r7
13damageext-1.0-r1
14db3-native-3.2.9-r1
15dbus-0.23.4-r1
16diet-x11-6.2.1-r2
17dropbear-0.46-r3
18expat-1.95.7-r0
19expat-native-1.95.7-r0
20fakeroot-native-1.2.13-r0
21fixesext-0.0cvs20050825-r0
22fixesext-0.0cvs20050826-r0
23flex-native-2.5.31-r2
24gcc-cross-3.4.4-r1
25gcc-cross-initial-3.4.4-r1
26gcc-cross-kernel-3.3.4-3.3.4-r2
27gdbm-native-1.8.3-r0
28gettext-native-0.14.1-r3
29glib-2.0-2.6.4-r0
30glib-2.0-native-2.6.5-r0
31glibc-2.3.5+cvs20050627-r0
32gmp-4.1.4-r0
33gnu-config-native-0.1cvs20050701-r4
34gtk-doc-1.0-r1
35gtk-doc-native-1.0-r1
36hotplug-dbus-0.9-r1
37initscripts-1.0-r56
38intltool-native-0.31-r0
39ipkg-0.99.152-r0
40ipkg-collateral-1.0-r2
41ipkg-link-1.6cvs20050825-r1
42ipkg-link-1.6cvs20050826-r1
43ipkg-native-0.99.152-r0
44ipkg-utils-native-1.6cvs20050825-r4
45ipkg-utils-native-1.6cvs20050826-r4
46irda-utils-0.9.16-r2
47libpcap-0.9.3-r1
48libtool-cross-1.5.10-r3
49libtool-native-1.5.10-r3
50libxdmcp-0.1.3-r1
51libxml-parser-perl-native-2.34-r0
52libxrandr-1.0.2-r1
53libxrender-0.8.4-r1
54linux-hotplug-20040920-r6
55linux-libc-headers-2.6.11.1-r1
56linux-omap1-2.6.12-rc2-r3
57lrzsz-0.12.20-r2
58m4-native-1.4.2-r0
59makedevs-1.0.0-r2
60module-init-tools-3.2-pre7-r0
61module-init-tools-cross-3.1-r3
62modutils-2.4.27-r7
63modutils-initscripts-1.0-r2
64ncurses-5.4-r8
65ncurses-native-5.4-r8
66netbase-4.21-r6
67network-suspend-scripts-1.1-r2
68nokia770-init-1.0-r3
69openswan-2.2.0-r3
70pcmcia-cs-3.2.8-r19
71perl-native-5.8.7-r0
72pkgconfig-native-0.15.0-r1
73portmap-5-9-r5
74ppp-2.4.3-r0
75ppp-dialin-0.1-r4
76psmisc-20.2-r3
77quilt-native-0.39-r0
78randrext-1.0-r0
79recordext-0.0cvs20050825-r0
80recordext-0.0cvs20050826-r0
81renderext-0.0cvs20050825-r0
82renderext-0.0cvs20050826-r0
83resourceext-1.0-r0
84rp1
85scap-0.1-r1
86setserial-2.17-r1
87sysfsutils-1.3.0-r0
88sysvinit-2.86-r19
89task-bootstrap-1.0-r25
90tinylogin-1.4-r3
91tslib-maemo-0.0.1-15-r1
92update-modules-1.0-r3
93update-rc.d-0.7-r0
94wireless-tools-28-pre6-r1
95wpa-supplicant-nossl-0.2.6-r3
96x11-6.2.1-r2
97xau-0.1.1-r1
98xcalibrateext-0.0cvs20050825-r0
99xcalibrateext-0.0cvs20050826-r0
100xext-0.0cvs20050825-r1
101xext-0.0cvs20050826-r1
102xextensions-1.0.3+cvs20050610-r0
103xfont-1.4.2-r2
104xpext-1.0-5-r0
105xproto-6.6.2-r0
106xserver-kdrive-omap-6.6.3-r2
107xsp-1.0.0-8-r0
108xtrans-0.1-r0
109zlib-1.2.3-r0
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h2200 b/openembedded/packages/tslib/tslib/ts.conf-h2200
index 6a6a231139..09309719f2 100644
--- a/openembedded/packages/tslib/tslib/ts.conf-h2200
+++ b/openembedded/packages/tslib/tslib/ts.conf-h2200
@@ -1,5 +1,4 @@
1module_raw input 1module_raw input
2module_raw linear_h2200
3module pthres pmin=1 2module pthres pmin=1
4module variance delta=30 3module variance delta=30
5module dejitter delta=100 4module dejitter delta=100
diff --git a/openembedded/packages/zaurus-updater/spitz/updater.sh b/openembedded/packages/zaurus-updater/spitz/updater.sh
index 73aa12c9a7..07d81b1bda 100755
--- a/openembedded/packages/zaurus-updater/spitz/updater.sh
+++ b/openembedded/packages/zaurus-updater/spitz/updater.sh
@@ -44,7 +44,6 @@ Cleanup(){
44 rm -f $VTMPNAME > /dev/null 2>&1 44 rm -f $VTMPNAME > /dev/null 2>&1
45 rm -f $MTMPNAME > /dev/null 2>&1 45 rm -f $MTMPNAME > /dev/null 2>&1
46 rm $CTRLPATH/* > /dev/null 2>&1 46 rm $CTRLPATH/* > /dev/null 2>&1
47 rm $DATAPATH/* > /dev/null 2>&1
48 exit $1 47 exit $1
49} 48}
50trap 'Cleanup 1' 1 15 49trap 'Cleanup 1' 1 15
@@ -82,7 +81,7 @@ fi
82### Check model ### 81### Check model ###
83/sbin/writerominfo 82/sbin/writerominfo
84MODEL=`cat /proc/deviceinfo/product` 83MODEL=`cat /proc/deviceinfo/product`
85if [ "$MODEL" != "SL-C3000" ] 84if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ]
86then 85then
87 echo 'MODEL:'$MODEL 86 echo 'MODEL:'$MODEL
88 echo 'ERROR:Invalid model!' 87 echo 'ERROR:Invalid model!'
@@ -92,6 +91,23 @@ then
92 done 91 done
93fi 92fi
94 93
94### Check that we have a valid tar
95for TARNAME in gnu-tar GNU-TAR
96do
97 if [ -e $DATAPATH/$TARNAME ]
98 then
99 TARBIN=$DATAPATH/$TARNAME
100 fi
101done
102
103if [ ! -e $TARBIN ]; then
104 echo 'Please place a valid copy of tar as "gnu-tar" on your card'
105 echo 'Please reset'
106 while true
107 do
108 done
109fi
110
95mkdir -p $TMPPATH > /dev/null 2>&1 111mkdir -p $TMPPATH > /dev/null 2>&1
96 112
97cd $DATAPATH/ 113cd $DATAPATH/
@@ -243,13 +259,17 @@ do
243 259
244 cd /hdd1 260 cd /hdd1
245 echo 'Now extracting...' 261 echo 'Now extracting...'
246 gzip -dc $DATAPATH/$TARGETFILE | tar xf - 262 gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
247 if [ "$?" != "0" ]; then 263 if [ "$?" != "0" ]; then
248 echo "Error!" 264 echo "Error!"
249 exit "$?" 265 exit "$?"
250 fi 266 fi
251 267
252 echo 'Success!' 268 echo 'Success!'
269
270 #This can be useful for debugging
271 #/bin/sh -i
272
253 # remount as RO 273 # remount as RO
254 cd / 274 cd /
255 umount /hdd1 275 umount /hdd1
diff --git a/openembedded/packages/zaurus-updater/zaurus-updater.bb b/openembedded/packages/zaurus-updater/zaurus-updater.bb
index c4db1055d5..7707e48eeb 100644
--- a/openembedded/packages/zaurus-updater/zaurus-updater.bb
+++ b/openembedded/packages/zaurus-updater/zaurus-updater.bb
@@ -3,7 +3,8 @@ DEPENDS = "encdec-updater-native"
3LICENSE = "zaurus-updater" 3LICENSE = "zaurus-updater"
4PR = "r2" 4PR = "r2"
5 5
6SRC_URI = "file://updater.sh" 6SRC_URI = "file://updater.sh \
7 file://gnu-tar.gz"
7S = "${WORKDIR}" 8S = "${WORKDIR}"
8 9
9do_compile() { 10do_compile() {
@@ -13,6 +14,14 @@ do_compile() {
13do_deploy() { 14do_deploy() {
14 install -d ${DEPLOY_DIR}/images/ 15 install -d ${DEPLOY_DIR}/images/
15 install -m 0755 updater.sh ${DEPLOY_DIR}/images/updater.sh.${MACHINE} 16 install -m 0755 updater.sh ${DEPLOY_DIR}/images/updater.sh.${MACHINE}
17
18 case ${MACHINE} in
19 spitz | borzoi )
20 install -m 0755 gnu-tar ${DEPLOY_DIR}/images/gnu-tar
21 ;;
22 *)
23 ;;
24 esac
16} 25}
17 26
18addtask deploy before do_build after do_compile 27addtask deploy before do_build after do_compile
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-11 19:01:54 +0000