summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openembedded/classes/package.bbclass51
-rw-r--r--openembedded/conf/distro/preferred-gpe-versions-2.7.inc32
-rw-r--r--openembedded/conf/machine/include/zaurus-clamshell-2.6.conf9
-rw-r--r--openembedded/packages/base-files/base-files/openslug/fstab5
-rw-r--r--openembedded/packages/base-files/base-files/tosa/fstab2
-rw-r--r--openembedded/packages/base-files/base-files_3.0.14.bb8
-rw-r--r--openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/README13
-rw-r--r--openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch8
-rw-r--r--openembedded/packages/busybox/busybox-1.00/openslug/defconfig461
-rw-r--r--openembedded/packages/busybox/busybox-1.00/openslug/udhcpscript.patch133
-rw-r--r--openembedded/packages/busybox/busybox-1.00/uclibc_posix.patch20
-rw-r--r--openembedded/packages/busybox/busybox_1.00.bb7
-rw-r--r--openembedded/packages/cairo/cairo_1.0.0.bb2
-rw-r--r--openembedded/packages/coreutils/coreutils-native_5.1.3.bb2
-rw-r--r--openembedded/packages/dropbear/dropbear/chansession-security-fix.patch74
-rw-r--r--openembedded/packages/dropbear/dropbear_0.46.bb3
-rw-r--r--openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb12
-rw-r--r--openembedded/packages/expat/expat_1.95.7.bb1
-rw-r--r--openembedded/packages/gcc/gcc-package-cross.inc2
-rw-r--r--openembedded/packages/gcc/gcc3-build.inc5
-rw-r--r--openembedded/packages/gcc/gcc_4.0.2.bb2
-rw-r--r--openembedded/packages/gdbm/gdbm-native_1.8.3.bb1
-rw-r--r--openembedded/packages/gdbm/gdbm_1.8.3.bb1
-rw-r--r--openembedded/packages/glib-2.0/glib-2.0-native_2.6.5.bb2
-rw-r--r--openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch16
-rw-r--r--openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch11
-rw-r--r--openembedded/packages/gnome/gconf-dbus_svn.bb11
-rw-r--r--openembedded/packages/gnome/gnome-mime-data_2.4.2.bb7
-rw-r--r--openembedded/packages/gnu-config/gnu-config_20050701.bb5
-rw-r--r--openembedded/packages/hostap/hostap-conf_1.0.bb15
-rw-r--r--openembedded/packages/hostap/hostap-modules_0.3.9.bb5
-rw-r--r--openembedded/packages/hostap/hostap-utils_0.3.7.bb2
-rw-r--r--openembedded/packages/hostap/hostap-utils_0.4.0.bb5
-rw-r--r--openembedded/packages/ice/ice_6.3.3.bb2
-rw-r--r--openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map20
-rw-r--r--openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map20
-rwxr-xr-xopenembedded/packages/initscripts/initscripts-1.0/keymap8
-rw-r--r--openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map20
-rw-r--r--openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map4
-rw-r--r--openembedded/packages/initscripts/initscripts_1.0.bb4
-rw-r--r--openembedded/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb1
-rw-r--r--openembedded/packages/jpeg/jpeg_6b.bb1
-rw-r--r--openembedded/packages/libxcursor/libxcursor_1.1.2.bb7
-rw-r--r--openembedded/packages/libxfixes/libxfixes_2.0.1.bb6
-rw-r--r--openembedded/packages/libxfixes/libxfixes_cvs.bb6
-rw-r--r--openembedded/packages/libxft/libxft_2.1.6.bb7
-rw-r--r--openembedded/packages/libxft/libxft_cvs.bb7
-rw-r--r--openembedded/packages/libxi/libxi_6.0.1.bb6
-rw-r--r--openembedded/packages/libxrandr/libxrandr_1.0.2.bb6
-rw-r--r--openembedded/packages/libxrender/libxrender_cvs.bb6
-rw-r--r--openembedded/packages/linux/linux-openzaurus_2.6.15.bb29
-rw-r--r--openembedded/packages/module-init-tools/files/ignore_arch_directory21
-rw-r--r--openembedded/packages/module-init-tools/files/manpagesopt22
-rw-r--r--openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory24
-rw-r--r--openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt41
-rw-r--r--openembedded/packages/module-init-tools/module-init-tools-cross_3.1.bb24
-rw-r--r--openembedded/packages/module-init-tools/module-init-tools-cross_3.2.2.bb15
-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.2.bb (renamed from openembedded/packages/module-init-tools/module-init-tools_3.2.1.bb)0
-rw-r--r--openembedded/packages/openswan/openswan_2.2.0.bb4
-rw-r--r--openembedded/packages/orinoco/spectrum-fw.bb1
-rw-r--r--openembedded/packages/pcmcia-cs/files/arm/pcmcia11
-rw-r--r--openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb2
-rw-r--r--openembedded/packages/perl/perl_5.8.7.bb2
-rw-r--r--openembedded/packages/popt/popt_1.7.bb2
-rw-r--r--openembedded/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch19
-rw-r--r--openembedded/packages/ppp/ppp_2.4.3.bb7
-rw-r--r--openembedded/packages/prism3-support/files/hostap-fw-load2
-rw-r--r--openembedded/packages/prism3-support/prism3-support_1.0.0.bb2
-rw-r--r--openembedded/packages/tslib/tslib-maemo_0.0.1-15.bb2
-rw-r--r--openembedded/packages/tslib/tslib_cvs.bb11
-rw-r--r--openembedded/packages/udev/udev-084/init2
-rw-r--r--openembedded/packages/udev/udev-084/udev.rules2
-rw-r--r--openembedded/packages/udev/udev_084.bb4
-rw-r--r--openembedded/packages/xau/xau_0.1.1.bb6
-rw-r--r--openembedded/packages/xau/xau_cvs.bb7
-rw-r--r--openembedded/packages/xcalibrate/xcalibrate_cvs.bb7
-rw-r--r--openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb7
-rw-r--r--openembedded/packages/xcomposite/xcomposite_cvs.bb6
-rw-r--r--openembedded/packages/xmu/xmu_cvs.bb3
-rw-r--r--openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb7
-rw-r--r--openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb5
-rw-r--r--openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb2
83 files changed, 429 insertions, 994 deletions
diff --git a/openembedded/classes/package.bbclass b/openembedded/classes/package.bbclass
index db479d5847..fd8d1b7b09 100644
--- a/openembedded/classes/package.bbclass
+++ b/openembedded/classes/package.bbclass
@@ -81,6 +81,53 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
81 81
82 bb.data.setVar('PACKAGES', ' '.join(packages), d) 82 bb.data.setVar('PACKAGES', ' '.join(packages), d)
83 83
84# Function to strip a single file, called from RUNSTRIP below
85# A working 'file' (one which works on the target architecture)
86# is necessary for this stuff to work.
87PACKAGE_DEPENDS ?= "file-native"
88DEPENDS_prepend =+ "${PACKAGE_DEPENDS} "
89#FIXME: this should be "" when any errors are gone!
90IGNORE_STRIP_ERRORS ?= "1"
91
92runstrip() {
93 local ro st
94 st=0
95 if { file "$1" || {
96 oewarn "file $1: failed (forced strip)" >&2
97 echo 'not stripped'
98 }
99 } | grep -q 'not stripped'
100 then
101 oenote "${STRIP} $1"
102 ro=
103 test -w "$1" || {
104 ro=1
105 chmod +w "$1"
106 }
107 '${STRIP}' "$1"
108 st=$?
109 test -n "$ro" && chmod -w "$1"
110 if test $st -ne 0
111 then
112 oewarn "runstrip: ${STRIP} $1: strip failed" >&2
113 if [ x${IGNORE_STRIP_ERRORS} == x1 ]
114 then
115 #FIXME: remove this, it's for error detection
116 if file "$1" 2>/dev/null >&2
117 then
118 (oefatal "${STRIP} $1: command failed" >/dev/tty)
119 else
120 (oefatal "file $1: command failed" >/dev/tty)
121 fi
122 st=0
123 fi
124 fi
125 else
126 oenote "runstrip: skip $1"
127 fi
128 return $st
129}
130
84python populate_packages () { 131python populate_packages () {
85 import glob, stat, errno, re 132 import glob, stat, errno, re
86 133
@@ -166,14 +213,14 @@ python populate_packages () {
166 dpath = os.path.dirname(fpath) 213 dpath = os.path.dirname(fpath)
167 bb.mkdirhier(dpath) 214 bb.mkdirhier(dpath)
168 if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file): 215 if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file):
169 stripfunc += "${STRIP} %s || : ;\n" % fpath 216 stripfunc += "\trunstrip %s || st=1\n" % fpath
170 ret = bb.movefile(file,fpath) 217 ret = bb.movefile(file,fpath)
171 if ret is None or ret == 0: 218 if ret is None or ret == 0:
172 raise bb.build.FuncFailed("File population failed") 219 raise bb.build.FuncFailed("File population failed")
173 if not stripfunc == "": 220 if not stripfunc == "":
174 from bb import build 221 from bb import build
175 # strip 222 # strip
176 bb.data.setVar('RUNSTRIP', '%s\nreturn 0' % stripfunc, localdata) 223 bb.data.setVar('RUNSTRIP', '\tlocal st\n\tst=0\n%s\treturn $st' % stripfunc, localdata)
177 bb.data.setVarFlag('RUNSTRIP', 'func', 1, localdata) 224 bb.data.setVarFlag('RUNSTRIP', 'func', 1, localdata)
178 bb.build.exec_func('RUNSTRIP', localdata) 225 bb.build.exec_func('RUNSTRIP', localdata)
179 del localdata 226 del localdata
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
index f8af96435b..933195977d 100644
--- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
@@ -20,13 +20,15 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
20PREFERRED_VERSION_atk ?= "1.9.0" 20PREFERRED_VERSION_atk ?= "1.9.0"
21PREFERRED_VERSION_cairo ?= "0.5.2" 21PREFERRED_VERSION_cairo ?= "0.5.2"
22PREFERRED_VERSION_glib-2.0 ?= "2.6.4" 22PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
23PREFERRED_VERSION_gtk+ ?= "2.6.7" 23PREFERRED_VERSION_gtk+ ?= "2.6.10"
24PREFERRED_VERSION_pango ?= "1.8.1" 24PREFERRED_VERSION_pango ?= "1.8.1"
25PREFERRED_VERSION_librsvg ?= "2.6.5" 25PREFERRED_VERSION_librsvg ?= "2.6.5"
26PREFERRED_VERSION_libgpewidget ?= "0.105" 26PREFERRED_VERSION_libgpewidget ?= "0.109"
27PREFERRED_VERSION_libgpepimc ?= "0.5" 27PREFERRED_VERSION_libgpepimc ?= "0.5"
28PREFERRED_VERSION_libgpevtype ?= "0.14" 28PREFERRED_VERSION_libgpevtype ?= "0.14"
29PREFERRED_VERSION_libschedule ?= "0.15" 29PREFERRED_VERSION_libschedule ?= "0.15"
30PREFERRED_VERSION_libcontactsdb ?= "0.3"
31PREFERRED_VERSION_libtododb ?= "0.09"
30PREFERRED_VERSION_gpe-icons ?= "0.25" 32PREFERRED_VERSION_gpe-icons ?= "0.25"
31PREFERRED_VERSION_libgsm ?= "1.0.10" 33PREFERRED_VERSION_libgsm ?= "1.0.10"
32PREFERRED_VERSION_diet-x11 ?= "6.2.1" 34PREFERRED_VERSION_diet-x11 ?= "6.2.1"
@@ -43,23 +45,23 @@ PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
43PREFERRED_VERSION_gpe-login ?= "0.83" 45PREFERRED_VERSION_gpe-login ?= "0.83"
44PREFERRED_VERSION_gpe-session-scripts ?= "0.66" 46PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
45PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" 47PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
46PREFERRED_VERSION_gpe-todo ?= "0.54" 48PREFERRED_VERSION_gpe-todo ?= "0.55"
47PREFERRED_VERSION_gpe-calendar ?= "0.66" 49PREFERRED_VERSION_gpe-calendar ?= "0.70"
48PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" 50PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
49PREFERRED_VERSION_gpe-contacts ?= "0.42" 51PREFERRED_VERSION_gpe-contacts ?= "0.43"
50PREFERRED_VERSION_gpe-today ?= "0.10" 52PREFERRED_VERSION_gpe-today ?= "0.10"
51PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" 53PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
52PREFERRED_VERSION_dbus ?= "0.23.4" 54PREFERRED_VERSION_dbus ?= "0.23.4"
53PREFERRED_VERSION_gpe-beam ?= "0.2.8" 55PREFERRED_VERSION_gpe-beam ?= "0.2.8"
54PREFERRED_VERSION_gpe-bluetooth ?= "0.47" 56PREFERRED_VERSION_gpe-bluetooth ?= "0.51"
55PREFERRED_VERSION_gpe-su ?= "0.19" 57PREFERRED_VERSION_gpe-su ?= "0.19"
56PREFERRED_VERSION_gpe-conf ?= "0.1.26" 58PREFERRED_VERSION_gpe-conf ?= "0.1.29"
57PREFERRED_VERSION_gpe-clock ?= "0.21" 59PREFERRED_VERSION_gpe-clock ?= "0.23"
58PREFERRED_VERSION_gpe-mininet ?= "0.5" 60PREFERRED_VERSION_gpe-mininet ?= "0.7"
59PREFERRED_VERSION_gpe-mixer ?= "0.42" 61PREFERRED_VERSION_gpe-mixer ?= "0.42"
60PREFERRED_VERSION_gpe-shield ?= "0.8" 62PREFERRED_VERSION_gpe-shield ?= "0.8"
61PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" 63PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
62PREFERRED_VERSION_gpe-taskmanager ?= "0.18" 64PREFERRED_VERSION_gpe-taskmanager ?= "0.19"
63PREFERRED_VERSION_keylaunch ?= "2.0.7" 65PREFERRED_VERSION_keylaunch ?= "2.0.7"
64PREFERRED_VERSION_minilite ?= "0.49" 66PREFERRED_VERSION_minilite ?= "0.49"
65PREFERRED_VERSION_xmonobut ?= "0.4" 67PREFERRED_VERSION_xmonobut ?= "0.4"
@@ -70,7 +72,7 @@ PREFERRED_VERSION_gpe-package ?= "0.3"
70PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" 72PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
71PREFERRED_VERSION_gpe-terminal ?= "1.1" 73PREFERRED_VERSION_gpe-terminal ?= "1.1"
72PREFERRED_VERSION_gpe-watch ?= "0.10" 74PREFERRED_VERSION_gpe-watch ?= "0.10"
73PREFERRED_VERSION_gpe-what ?= "0.33" 75PREFERRED_VERSION_gpe-what ?= "0.42"
74PREFERRED_VERSION_gpe-filemanager ?= "0.23" 76PREFERRED_VERSION_gpe-filemanager ?= "0.23"
75PREFERRED_VERSION_gpe-go ?= "0.05" 77PREFERRED_VERSION_gpe-go ?= "0.05"
76PREFERRED_VERSION_gpe-irc ?= "0.07" 78PREFERRED_VERSION_gpe-irc ?= "0.07"
@@ -84,11 +86,11 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1"
84PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" 86PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
85PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" 87PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
86PREFERRED_VERSION_dillo2 ?= "0.6.6" 88PREFERRED_VERSION_dillo2 ?= "0.6.6"
87PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" 89PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}"
88PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" 90PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
89PREFERRED_VERSION_linphone ?= "0.12.2" 91PREFERRED_VERSION_linphone ?= "0.12.2"
90PREFERRED_VERSION_firefox ?= "1.0" 92PREFERRED_VERSION_firefox ?= "1.0"
91PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" 93PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1"
92PREFERRED_VERSION_poppler ?= "0.3.3" 94PREFERRED_VERSION_poppler ?= "0.3.3"
93PREFERRED_VERSION_evince ?= "0.3.2" 95PREFERRED_VERSION_evince ?= "0.3.2"
94PREFERRED_VERSION_gpe_mini_browser ?= "0.17" 96PREFERRED_VERSION_gpe_mini_browser ?= "0.19"
diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
index 007750a39b..271a6ca3e7 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -3,10 +3,6 @@
3 3
4PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" 4PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
5 5
6BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \
7pcmciautils apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
8ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib"
9
10BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ 6BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
11pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ 7pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
12ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" 8ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
@@ -36,12 +32,13 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage
36# Wireless Modules 32# Wireless Modules
37BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ 33BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
38 kernel-module-hermes kernel-module-orinoco \ 34 kernel-module-hermes kernel-module-orinoco \
39 kernel-module-orinoco-cs kernel-module-spectrum-cs" 35 kernel-module-orinoco-cs kernel-module-spectrum-cs \
36 hostap-conf orinoco-conf"
40 37
41# Sound Modules 38# Sound Modules
42BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ 39BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
43 kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \ 40 kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \
44 kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" 41 kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
45BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " 42BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
46BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " 43BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
47BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " 44BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
diff --git a/openembedded/packages/base-files/base-files/openslug/fstab b/openembedded/packages/base-files/base-files/openslug/fstab
deleted file mode 100644
index 0ac6b1460c..0000000000
--- a/openembedded/packages/base-files/base-files/openslug/fstab
+++ /dev/null
@@ -1,5 +0,0 @@
1rootfs / jffs2 defaults 1 1
2proc /proc proc defaults 0 0
3tmpfs /var tmpfs defaults 0 0
4tmpfs /media/ram tmpfs defaults 0 0
5usbfs /proc/bus/usb usbfs defaults 0 0
diff --git a/openembedded/packages/base-files/base-files/tosa/fstab b/openembedded/packages/base-files/base-files/tosa/fstab
index 886b065b52..fb37e07aec 100644
--- a/openembedded/packages/base-files/base-files/tosa/fstab
+++ b/openembedded/packages/base-files/base-files/tosa/fstab
@@ -9,4 +9,4 @@ tmpfs /media/ram tmpfs defaults 0 0
9# SD/MMC in kernel 2.4 9# SD/MMC in kernel 2.4
10/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 10/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
11# SD/MMC in kernel 2.6 11# SD/MMC in kernel 2.6
12/dev/mmcblk0p1 /media/card auto defaults,sync,auto 0 0 12/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 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 d23c43046a..0689cfa0f3 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 = "r45" 4PR = "r47"
5LICENSE = "GPL" 5LICENSE = "GPL"
6 6
7SRC_URI = " \ 7SRC_URI = " \
@@ -46,7 +46,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
46 ${sysconfdir}/default" 46 ${sysconfdir}/default"
47 47
48hostname = "openembedded" 48hostname = "openembedded"
49hostname_openslug = "openslug" 49hostname_slugos = "nslu2"
50hostname_mnci = "MNCI" 50hostname_mnci = "MNCI"
51PACKAGE_ARCH_mnci = "mnci" 51PACKAGE_ARCH_mnci = "mnci"
52hostname_rt3000 = "MNRT" 52hostname_rt3000 = "MNRT"
@@ -121,7 +121,7 @@ do_install_append_nylon() {
121 ln -sf /var/tmp ${D}/tmp 121 ln -sf /var/tmp ${D}/tmp
122} 122}
123 123
124do_install_append_openslug() { 124do_install_append_slugos() {
125 printf "" "" >${D}${sysconfdir}/resolv.conf 125 printf "" "" >${D}${sysconfdir}/resolv.conf
126 rm -r ${D}/mnt/* 126 rm -r ${D}/mnt/*
127 rmdir ${D}/home/root 127 rmdir ${D}/home/root
@@ -146,5 +146,5 @@ FILES_${PN}-unslung = ""
146 146
147CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" 147CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
148CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" 148CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
149CONFFILES_${PN}_openslug = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" 149CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
150 150
diff --git a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/README b/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/README
deleted file mode 100644
index 05c2e419f5..0000000000
--- a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/README
+++ /dev/null
@@ -1,13 +0,0 @@
1This patch overrides the root-home.patch for DISTRO=openslug
2
3The patch sets a root password on /etc/passwd, this password is
4
5opeNSLUg
6
7This allows ssh (dropbear) login to an OpenSlug NSLU2 using that
8password.
9
10The password is NO MORE SECURE than the previous empty string,
11however, because ssh logins can now succeed the NSLU2 is LESS
12secure! This password must be changed as soon as possible after
13initial configuration of the NSLU2.
diff --git a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch b/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
deleted file mode 100644
index 97dab68f33..0000000000
--- a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
+++ /dev/null
@@ -1,8 +0,0 @@
1--- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200
2+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200
3@@ -1,4 +1,4 @@
4-root::0:0:root:/root:/bin/sh
5+root:Xm./49bYkrkuo:0:0:root:/root:/bin/sh
6 daemon:*:1:1:daemon:/usr/sbin:/bin/sh
7 bin:*:2:2:bin:/bin:/bin/sh
8 sys:*:3:3:sys:/dev:/bin/sh
diff --git a/openembedded/packages/busybox/busybox-1.00/openslug/defconfig b/openembedded/packages/busybox/busybox-1.00/openslug/defconfig
deleted file mode 100644
index 7debaeced2..0000000000
--- a/openembedded/packages/busybox/busybox-1.00/openslug/defconfig
+++ /dev/null
@@ -1,461 +0,0 @@
1#
2# Automatically generated make config: don't edit
3#
4HAVE_DOT_CONFIG=y
5
6#
7# General Configuration
8#
9# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
10CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
11# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
12CONFIG_FEATURE_VERBOSE_USAGE=y
13# CONFIG_FEATURE_INSTALLER is not set
14# CONFIG_LOCALE_SUPPORT is not set
15CONFIG_FEATURE_DEVFS=y
16CONFIG_FEATURE_DEVPTS=y
17# CONFIG_FEATURE_CLEAN_UP is not set
18# CONFIG_FEATURE_SUID is not set
19# CONFIG_SELINUX is not set
20
21#
22# Build Options
23#
24# CONFIG_STATIC is not set
25CONFIG_LFS=y
26# USING_CROSS_COMPILER is not set
27EXTRA_CFLAGS_OPTIONS=""
28
29#
30# Installation Options
31#
32# CONFIG_INSTALL_NO_USR is not set
33PREFIX="./_install"
34
35#
36# Archival Utilities
37#
38CONFIG_AR=y
39# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
40CONFIG_BUNZIP2=y
41# CONFIG_CPIO is not set
42# CONFIG_DPKG is not set
43# CONFIG_DPKG_DEB is not set
44CONFIG_GUNZIP=y
45# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
46CONFIG_GZIP=y
47# CONFIG_RPM2CPIO is not set
48# CONFIG_RPM is not set
49CONFIG_TAR=y
50CONFIG_FEATURE_TAR_CREATE=y
51CONFIG_FEATURE_TAR_BZIP2=y
52CONFIG_FEATURE_TAR_FROM=y
53CONFIG_FEATURE_TAR_GZIP=y
54# CONFIG_FEATURE_TAR_COMPRESS is not set
55CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
56CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
57# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
58# CONFIG_UNCOMPRESS is not set
59CONFIG_UNZIP=y
60
61#
62# Common options for cpio and tar
63#
64# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
65
66#
67# Coreutils
68#
69CONFIG_BASENAME=y
70# CONFIG_CAL is not set
71CONFIG_CAT=y
72CONFIG_CHGRP=y
73CONFIG_CHMOD=y
74CONFIG_CHOWN=y
75CONFIG_CHROOT=y
76# CONFIG_CMP is not set
77CONFIG_CP=y
78CONFIG_CUT=y
79CONFIG_DATE=y
80
81#
82# date (forced enabled for use with watch)
83#
84# CONFIG_FEATURE_DATE_ISOFMT is not set
85CONFIG_DD=y
86CONFIG_DF=y
87CONFIG_DIRNAME=y
88# CONFIG_DOS2UNIX is not set
89CONFIG_DU=y
90CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
91CONFIG_ECHO=y
92CONFIG_FEATURE_FANCY_ECHO=y
93CONFIG_ENV=y
94CONFIG_EXPR=y
95CONFIG_FALSE=y
96# CONFIG_FOLD is not set
97CONFIG_HEAD=y
98# CONFIG_FEATURE_FANCY_HEAD is not set
99# CONFIG_HOSTID is not set
100CONFIG_ID=y
101# CONFIG_INSTALL is not set
102# CONFIG_LENGTH is not set
103CONFIG_LN=y
104CONFIG_LOGNAME=y
105CONFIG_LS=y
106CONFIG_FEATURE_LS_FILETYPES=y
107CONFIG_FEATURE_LS_FOLLOWLINKS=y
108CONFIG_FEATURE_LS_RECURSIVE=y
109CONFIG_FEATURE_LS_SORTFILES=y
110CONFIG_FEATURE_LS_TIMESTAMPS=y
111CONFIG_FEATURE_LS_USERNAME=y
112CONFIG_FEATURE_LS_COLOR=y
113CONFIG_MD5SUM=y
114CONFIG_MKDIR=y
115CONFIG_MKFIFO=y
116CONFIG_MKNOD=y
117CONFIG_MV=y
118CONFIG_OD=y
119CONFIG_PRINTF=y
120CONFIG_PWD=y
121# CONFIG_REALPATH is not set
122CONFIG_RM=y
123CONFIG_RMDIR=y
124CONFIG_SEQ=y
125# CONFIG_SHA1SUM is not set
126CONFIG_SLEEP=y
127# CONFIG_FEATURE_FANCY_SLEEP is not set
128CONFIG_SORT=y
129CONFIG_STTY=y
130CONFIG_SYNC=y
131CONFIG_TAIL=y
132CONFIG_FEATURE_FANCY_TAIL=y
133CONFIG_TEE=y
134# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
135CONFIG_TEST=y
136
137#
138# test (forced enabled for use with shell)
139#
140# CONFIG_FEATURE_TEST_64 is not set
141CONFIG_TOUCH=y
142CONFIG_TR=y
143CONFIG_TRUE=y
144CONFIG_TTY=y
145CONFIG_UNAME=y
146CONFIG_UNIQ=y
147# CONFIG_USLEEP is not set
148# CONFIG_UUDECODE is not set
149# CONFIG_UUENCODE is not set
150CONFIG_WATCH=y
151CONFIG_WC=y
152CONFIG_WHO=y
153CONFIG_WHOAMI=y
154CONFIG_YES=y
155
156#
157# Common options for cp and mv
158#
159# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
160
161#
162# Common options for ls and more
163#
164CONFIG_FEATURE_AUTOWIDTH=y
165
166#
167# Common options for df, du, ls
168#
169CONFIG_FEATURE_HUMAN_READABLE=y
170
171#
172# Common options for md5sum, sha1sum
173#
174# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
175
176#
177# Console Utilities
178#
179CONFIG_CHVT=y
180CONFIG_CLEAR=y
181CONFIG_DEALLOCVT=y
182CONFIG_DUMPKMAP=y
183CONFIG_GETKEY=y
184CONFIG_LOADFONT=y
185CONFIG_LOADKMAP=y
186CONFIG_OPENVT=y
187CONFIG_RESET=y
188# CONFIG_SETKEYCODES is not set
189
190#
191# Debian Utilities
192#
193CONFIG_MKTEMP=y
194# CONFIG_PIPE_PROGRESS is not set
195CONFIG_READLINK=y
196CONFIG_FEATURE_READLINK_FOLLOW=y
197CONFIG_RUN_PARTS=y
198CONFIG_START_STOP_DAEMON=y
199CONFIG_WHICH=y
200
201#
202# Editors
203#
204CONFIG_AWK=y
205CONFIG_FEATURE_AWK_MATH=y
206# CONFIG_PATCH is not set
207CONFIG_SED=y
208CONFIG_VI=y
209CONFIG_FEATURE_VI_COLON=y
210CONFIG_FEATURE_VI_YANKMARK=y
211CONFIG_FEATURE_VI_SEARCH=y
212CONFIG_FEATURE_VI_USE_SIGNALS=y
213# CONFIG_FEATURE_VI_DOT_CMD is not set
214# CONFIG_FEATURE_VI_READONLY is not set
215# CONFIG_FEATURE_VI_SETOPTS is not set
216# CONFIG_FEATURE_VI_SET is not set
217CONFIG_FEATURE_VI_WIN_RESIZE=y
218CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
219
220#
221# Finding Utilities
222#
223# CONFIG_FIND is not set
224CONFIG_GREP=y
225CONFIG_FEATURE_GREP_EGREP_ALIAS=y
226CONFIG_FEATURE_GREP_FGREP_ALIAS=y
227CONFIG_FEATURE_GREP_CONTEXT=y
228# CONFIG_XARGS is not set
229
230#
231# Init Utilities
232#
233# CONFIG_INIT is not set
234# CONFIG_HALT is not set
235# CONFIG_POWEROFF is not set
236# CONFIG_REBOOT is not set
237# CONFIG_MESG is not set
238
239#
240# Login/Password Management Utilities
241#
242# CONFIG_USE_BB_PWD_GRP is not set
243# CONFIG_ADDGROUP is not set
244# CONFIG_DELGROUP is not set
245# CONFIG_ADDUSER is not set
246# CONFIG_DELUSER is not set
247# CONFIG_GETTY is not set
248CONFIG_FEATURE_U_W_TMP=y
249# CONFIG_LOGIN is not set
250# CONFIG_PASSWD is not set
251# CONFIG_SU is not set
252# CONFIG_SULOGIN is not set
253# CONFIG_VLOCK is not set
254
255#
256# Miscellaneous Utilities
257#
258# CONFIG_ADJTIMEX is not set
259# CONFIG_CROND is not set
260# CONFIG_CRONTAB is not set
261CONFIG_DC=y
262# CONFIG_DEVFSD is not set
263# CONFIG_LAST is not set
264# CONFIG_HDPARM is not set
265# CONFIG_MAKEDEVS is not set
266# CONFIG_MT is not set
267# CONFIG_RX is not set
268CONFIG_STRINGS=y
269CONFIG_TIME=y
270# CONFIG_WATCHDOG is not set
271
272#
273# Linux Module Utilities
274#
275# CONFIG_INSMOD is not set
276# CONFIG_LSMOD is not set
277# CONFIG_MODPROBE is not set
278# CONFIG_RMMOD is not set
279
280#
281# Networking Utilities
282#
283CONFIG_FEATURE_IPV6=y
284# CONFIG_ARPING is not set
285# CONFIG_FTPGET is not set
286# CONFIG_FTPPUT is not set
287CONFIG_HOSTNAME=y
288# CONFIG_HTTPD is not set
289CONFIG_IFCONFIG=y
290CONFIG_FEATURE_IFCONFIG_STATUS=y
291# CONFIG_FEATURE_IFCONFIG_SLIP is not set
292# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
293CONFIG_FEATURE_IFCONFIG_HW=y
294# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
295CONFIG_IFUPDOWN=y
296# CONFIG_FEATURE_IFUPDOWN_IP is not set
297CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
298CONFIG_FEATURE_IFUPDOWN_IPV4=y
299CONFIG_FEATURE_IFUPDOWN_IPV6=y
300# CONFIG_FEATURE_IFUPDOWN_IPX is not set
301# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
302# CONFIG_INETD is not set
303CONFIG_IP=y
304CONFIG_FEATURE_IP_ADDRESS=y
305CONFIG_FEATURE_IP_LINK=y
306CONFIG_FEATURE_IP_ROUTE=y
307CONFIG_FEATURE_IP_TUNNEL=y
308# CONFIG_IPCALC is not set
309# CONFIG_IPADDR is not set
310# CONFIG_IPLINK is not set
311# CONFIG_IPROUTE is not set
312# CONFIG_IPTUNNEL is not set
313# CONFIG_NAMEIF is not set
314CONFIG_NC=y
315CONFIG_NETSTAT=y
316CONFIG_NSLOOKUP=y
317CONFIG_PING=y
318CONFIG_FEATURE_FANCY_PING=y
319CONFIG_PING6=y
320CONFIG_FEATURE_FANCY_PING6=y
321CONFIG_ROUTE=y
322CONFIG_TELNET=y
323# CONFIG_FEATURE_TELNET_TTYPE is not set
324CONFIG_FEATURE_TELNET_AUTOLOGIN=y
325# CONFIG_TELNETD is not set
326CONFIG_TFTP=y
327CONFIG_FEATURE_TFTP_GET=y
328CONFIG_FEATURE_TFTP_PUT=y
329# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
330# CONFIG_FEATURE_TFTP_DEBUG is not set
331CONFIG_TRACEROUTE=y
332# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
333# CONFIG_VCONFIG is not set
334CONFIG_WGET=y
335CONFIG_FEATURE_WGET_STATUSBAR=y
336CONFIG_FEATURE_WGET_AUTHENTICATION=y
337CONFIG_FEATURE_WGET_IP6_LITERAL=y
338
339#
340# udhcp Server/Client
341#
342# CONFIG_UDHCPD is not set
343CONFIG_UDHCPC=y
344CONFIG_FEATURE_UDHCP_SYSLOG=y
345# CONFIG_FEATURE_UDHCP_DEBUG is not set
346
347#
348# Process Utilities
349#
350CONFIG_FREE=y
351CONFIG_KILL=y
352CONFIG_KILLALL=y
353CONFIG_PIDOF=y
354CONFIG_PS=y
355CONFIG_RENICE=y
356CONFIG_TOP=y
357FEATURE_CPU_USAGE_PERCENTAGE=y
358CONFIG_UPTIME=y
359# CONFIG_SYSCTL is not set
360
361#
362# Another Bourne-like Shell
363#
364CONFIG_FEATURE_SH_IS_ASH=y
365# CONFIG_FEATURE_SH_IS_HUSH is not set
366# CONFIG_FEATURE_SH_IS_LASH is not set
367# CONFIG_FEATURE_SH_IS_MSH is not set
368# CONFIG_FEATURE_SH_IS_NONE is not set
369CONFIG_ASH=y
370
371#
372# Ash Shell Options
373#
374CONFIG_ASH_JOB_CONTROL=y
375CONFIG_ASH_PIPE_OPTIMIZATION=y
376CONFIG_FEATURE_BUILTIN_TEST=y
377CONFIG_FEATURE_BUILTIN_ECHO=y
378CONFIG_FEATURE_BUILTIN_PIDOF=y
379CONFIG_ASH_ALIAS=y
380CONFIG_ASH_MATH_SUPPORT=y
381# CONFIG_ASH_MATH_SUPPORT_64 is not set
382CONFIG_ASH_GETOPTS=y
383# CONFIG_ASH_CMDCMD is not set
384# CONFIG_ASH_MAIL is not set
385CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
386# CONFIG_ASH_RANDOM_SUPPORT is not set
387# CONFIG_HUSH is not set
388# CONFIG_LASH is not set
389# CONFIG_MSH is not set
390
391#
392# Bourne Shell Options
393#
394CONFIG_FEATURE_SH_EXTRA_QUIET=y
395# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
396CONFIG_FEATURE_COMMAND_EDITING=y
397CONFIG_FEATURE_COMMAND_HISTORY=63
398# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
399CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
400# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
401CONFIG_FEATURE_SH_FANCY_PROMPT=y
402
403#
404# System Logging Utilities
405#
406CONFIG_SYSLOGD=y
407# CONFIG_FEATURE_ROTATE_LOGFILE is not set
408CONFIG_FEATURE_REMOTE_LOG=y
409CONFIG_FEATURE_IPC_SYSLOG=y
410CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
411CONFIG_LOGREAD=y
412# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
413CONFIG_KLOGD=y
414CONFIG_LOGGER=y
415
416#
417# Linux System Utilities
418#
419CONFIG_DMESG=y
420CONFIG_FBSET=y
421CONFIG_FEATURE_FBSET_FANCY=y
422# CONFIG_FEATURE_FBSET_READMODE is not set
423# CONFIG_FDFLUSH is not set
424# CONFIG_FDFORMAT is not set
425CONFIG_FDISK=y
426FDISK_SUPPORT_LARGE_DISKS=y
427CONFIG_FEATURE_FDISK_WRITABLE=y
428# CONFIG_FEATURE_AIX_LABEL is not set
429# CONFIG_FEATURE_SGI_LABEL is not set
430# CONFIG_FEATURE_SUN_LABEL is not set
431# CONFIG_FEATURE_OSF_LABEL is not set
432# CONFIG_FEATURE_FDISK_ADVANCED is not set
433# CONFIG_FREERAMDISK is not set
434# CONFIG_FSCK_MINIX is not set
435# CONFIG_MKFS_MINIX is not set
436# CONFIG_GETOPT is not set
437CONFIG_HEXDUMP=y
438CONFIG_HWCLOCK=y
439CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
440CONFIG_LOSETUP=y
441CONFIG_MKSWAP=y
442CONFIG_MORE=y
443CONFIG_FEATURE_USE_TERMIOS=y
444CONFIG_PIVOT_ROOT=y
445# CONFIG_RDATE is not set
446CONFIG_SWAPONOFF=y
447CONFIG_MOUNT=y
448CONFIG_NFSMOUNT=y
449CONFIG_UMOUNT=y
450CONFIG_FEATURE_MOUNT_FORCE=y
451
452#
453# Common options for mount/umount
454#
455CONFIG_FEATURE_MOUNT_LOOP=y
456# CONFIG_FEATURE_MTAB_SUPPORT is not set
457
458#
459# Debugging Options
460#
461# CONFIG_DEBUG is not set
diff --git a/openembedded/packages/busybox/busybox-1.00/openslug/udhcpscript.patch b/openembedded/packages/busybox/busybox-1.00/openslug/udhcpscript.patch
deleted file mode 100644
index 010f64a53f..0000000000
--- a/openembedded/packages/busybox/busybox-1.00/openslug/udhcpscript.patch
+++ /dev/null
@@ -1,133 +0,0 @@
1--- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script 2004-10-13 00:18:05.000000000 -0700
2+++ busybox-1.00/examples/udhcp/simple.script 2005-06-05 15:08:28.432605118 -0700
3@@ -1,40 +1,101 @@
4 #!/bin/sh
5+# openslug UDHCP client script
6+# this must set the HW address (MAC) on the interface
7+#
8+. /etc/default/functions
9
10-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
11
12-[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
13+echodns(){
14+ local dns
15+ if test $# -gt 0
16+ then
17+ for dns in "$@"
18+ do
19+ echo "nameserver $dns"
20+ done
21+ fi
22+}
23+
24+# Output the correct contents for resolv.conf
25+mkresolv() {
26+ test -n "$domain" && echo "search $domain"
27+ echodns $dns
28+}
29+
30+# checksum of a file (or stdin if -)
31+md5strm() {
32+ md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p'
33+}
34+
35+bind() {
36+ local B N metric i olddomain
37+ B=
38+ test -n "$broadcast" && B="broadcast $broadcast"
39+ N=
40+ test -n "$subnet" && N="netmask $subnet"
41+ ifconfig "$interface" "$ip" $B $N up
42+
43+ # If given router information delete the old information and
44+ # enter new stuff, routers get metrics incremented by 1
45+ # between each (this is somewhat arbitrary)
46+ if test -n "$router"
47+ then
48+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null
49+ do
50+ :
51+ done
52
53-RESOLV_CONF="/etc/resolv.conf"
54-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
55-[ -n "$subnet" ] && NETMASK="netmask $subnet"
56+ metric=0
57+ for i in $router
58+ do
59+ route add default gw "$i" dev "$interface" metric $((metric++))
60+ done
61+ fi
62+
63+ olddomain=
64+ test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)"
65+ if test -n "$domain" -a "$domain" != "$olddomain"
66+ then
67+ echo "$domain" >/etc/defaultdomain
68+ # and update the kernel view too
69+ echo "$domain" >/proc/sys/kernel/domainname
70+ fi
71+
72+ # Update /etc/resolv.conf to reflect domain and dns information,
73+ # this always clears resolv.conf if none is given
74+ md5old="$(md5strm /etc/resolv.conf)"
75+ md5new="$(mkresolv | md5strm -)"
76+ test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf
77+}
78
79 case "$1" in
80- deconfig)
81- /sbin/ifconfig $interface 0.0.0.0
82- ;;
83-
84- renew|bound)
85- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
86-
87- if [ -n "$router" ] ; then
88- echo "deleting routers"
89- while route del default gw 0.0.0.0 dev $interface ; do
90- :
91- done
92-
93- metric=0
94- for i in $router ; do
95- route add default gw $i dev $interface metric $((metric++))
96- done
97+deconfig)
98+ # Bring the interface up (without inet at this point)
99+ ifconfig "$interface" up;;
100+
101+renew|bound)
102+ bind;;
103+
104+leasefail)
105+ # Pull the values from the config data if (only only if) this
106+ # is the config interface
107+ if test "$interface" = "$(config iface)"
108+ then
109+ ip="$(config ip)"
110+ if test -n "$ip"
111+ then
112+ router="$(config gateway)"
113+ subnet="$(config netmask)"
114+ broadcast="$(config broadcast)"
115+ domain="$(config domain)"
116+ dns="$(config dns)"
117+
118+ bind
119 fi
120+ fi;;
121
122- echo -n > $RESOLV_CONF
123- [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
124- for i in $dns ; do
125- echo adding dns $i
126- echo nameserver $i >> $RESOLV_CONF
127- done
128- ;;
129+*) echo "udhcpc: $*: unknown command" >&2
130+ exit 1;;
131 esac
132
133 exit 0
diff --git a/openembedded/packages/busybox/busybox-1.00/uclibc_posix.patch b/openembedded/packages/busybox/busybox-1.00/uclibc_posix.patch
new file mode 100644
index 0000000000..aefb994068
--- /dev/null
+++ b/openembedded/packages/busybox/busybox-1.00/uclibc_posix.patch
@@ -0,0 +1,20 @@
1see http://www.busybox.net/lists/busybox/2004-December/013276.html
2
3--- busybox-old/libbb/loop.c 2004-08-16 04:36:28.000000000 -0400
4+++ busybox/libbb/loop.c 2004-12-04 23:45:58.000000000 -0500
5@@ -19,6 +19,7 @@
6 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
7 */
8
9+#include <asm/posix_types.h>
10 #include <stdio.h>
11 #include <errno.h>
12 #include <fcntl.h>
13@@ -30,7 +31,6 @@
14 /* Grumble... The 2.6.x kernel breaks asm/posix_types.h
15 * so we get to try and cope as best we can... */
16 #include <linux/version.h>
17-#include <asm/posix_types.h>
18
19 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
20 #define __bb_kernel_dev_t __kernel_old_dev_t
diff --git a/openembedded/packages/busybox/busybox_1.00.bb b/openembedded/packages/busybox/busybox_1.00.bb
index 988265d72c..5b770669c1 100644
--- a/openembedded/packages/busybox/busybox_1.00.bb
+++ b/openembedded/packages/busybox/busybox_1.00.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
10LICENSE = "GPL" 10LICENSE = "GPL"
11SECTION = "base" 11SECTION = "base"
12PRIORITY = "required" 12PRIORITY = "required"
13PR = "r30" 13PR = "r32"
14 14
15SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ 15SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
16 file://add-getkey-applet.patch;patch=1 \ 16 file://add-getkey-applet.patch;patch=1 \
@@ -28,6 +28,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
28 file://dhcp-hostname.patch;patch=1 \ 28 file://dhcp-hostname.patch;patch=1 \
29 file://gzip-spurious-const.patch;patch=1 \ 29 file://gzip-spurious-const.patch;patch=1 \
30 file://ifupdown-spurious-environ.patch;patch=1 \ 30 file://ifupdown-spurious-environ.patch;patch=1 \
31 file://uclibc_posix.patch;patch=1 \
31 file://defconfig \ 32 file://defconfig \
32 file://busybox-cron \ 33 file://busybox-cron \
33 file://busybox-httpd \ 34 file://busybox-httpd \
@@ -56,8 +57,8 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
56INITSCRIPT_NAME_${PN} = "syslog" 57INITSCRIPT_NAME_${PN} = "syslog"
57CONFFILES_${PN} = "${sysconfdir}/syslog.conf" 58CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
58 59
59# This disables the syslog startup links in openslug (see openslug-init) 60# This disables the syslog startup links in slugos (see slugos-init)
60INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ." 61INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
61 62
62inherit cml1 update-rc.d 63inherit cml1 update-rc.d
63 64
diff --git a/openembedded/packages/cairo/cairo_1.0.0.bb b/openembedded/packages/cairo/cairo_1.0.0.bb
index aa97a9f4de..84cb581174 100644
--- a/openembedded/packages/cairo/cairo_1.0.0.bb
+++ b/openembedded/packages/cairo/cairo_1.0.0.bb
@@ -11,5 +11,5 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13do_stage () { 13do_stage () {
14 oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} 14 autotools_stage_all
15} 15}
diff --git a/openembedded/packages/coreutils/coreutils-native_5.1.3.bb b/openembedded/packages/coreutils/coreutils-native_5.1.3.bb
index 3fbe1bb6f1..74b39541fa 100644
--- a/openembedded/packages/coreutils/coreutils-native_5.1.3.bb
+++ b/openembedded/packages/coreutils/coreutils-native_5.1.3.bb
@@ -1,7 +1,7 @@
1SECTION = "base" 1SECTION = "base"
2inherit native
3 2
4FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" 3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
5S = "${WORKDIR}/coreutils-${PV}" 4S = "${WORKDIR}/coreutils-${PV}"
6 5
7include coreutils_${PV}.bb 6include coreutils_${PV}.bb
7inherit native
diff --git a/openembedded/packages/dropbear/dropbear/chansession-security-fix.patch b/openembedded/packages/dropbear/dropbear/chansession-security-fix.patch
new file mode 100644
index 0000000000..bc4c461fee
--- /dev/null
+++ b/openembedded/packages/dropbear/dropbear/chansession-security-fix.patch
@@ -0,0 +1,74 @@
1Date: Sun, 11 Dec 2005 23:30:02 +0800
2From: Matt Johnston <matt@ucc.asn.au>
3To: dropbear@ucc.gu.uwa.edu.au
4Subject: Dropbear 0.47 (and security fix)
5Message-ID: <20051211153002.GH28839@ucc.gu.uwa.edu.au>
6
7Hi all.
8
9I've put up a new release 0.47 of Dropbear, which has
10various fixes and new features - see the change summary
11below.
12http://matt.ucc.asn.au/dropbear/dropbear.html is the
13url as usual or directly at
14http://matt.ucc.asn.au/dropbear/dropbear-0.47.tar.bz2
15
16This release also fixes a potential security issue, which
17may allow authenticated users to run arbitrary code as the
18server user. I'm unsure exactly how likely it is to be
19exploitable, but anyone who's running a multi-user server is
20advised to upgrade. For older releases, the patch is:
21(against chanesssion.c for 0.43 and earlier).
22
23--- dropbear/svr-chansession.c
24+++ dropbear/svr-chansession.c
25@@ -810,7 +810,7 @@
26 /* need to increase size */
27 if (i == svr_ses.childpidsize) {
28 svr_ses.childpids = (struct ChildPid*)m_realloc(svr_ses.childpids,
29- sizeof(struct ChildPid) * svr_ses.childpidsize+1);
30+ sizeof(struct ChildPid) * (svr_ses.childpidsize+1));
31 svr_ses.childpidsize++;
32 }
33
34
35Matt
36
37
380.47 - Thurs Dec 8 2005
39
40- SECURITY: fix for buffer allocation error in server code, could potentially
41 allow authenticated users to gain elevated privileges. All multi-user systems
42 running the server should upgrade (or apply the patch available on the
43 Dropbear webpage).
44
45- Fix channel handling code so that redirecting to /dev/null doesn't use
46 100% CPU.
47
48- Turn on zlib compression for dbclient.
49
50- Set "low delay" TOS bit, can significantly improve interactivity
51 over some links.
52
53- Added client keyboard-interactive mode support, allows operation with
54 newer OpenSSH servers in default config.
55
56- Log when pubkey auth fails because of bad ~/.ssh/authorized_keys permissions
57
58- Improve logging of assertions
59
60- Added aes-256 cipher and sha1-96 hmac.
61
62- Fix twofish so that it actually works.
63
64- Improve PAM prompt comparison.
65
66- Added -g (dbclient) and -a (dropbear server) options to allow
67 connections to listening forwarded ports from remote machines.
68
69- Various other minor fixes
70
71- Compile fixes for glibc 2.1 (ss_family vs __ss_family) and NetBSD
72 (netinet/in_systm.h needs to be included).
73
74
diff --git a/openembedded/packages/dropbear/dropbear_0.46.bb b/openembedded/packages/dropbear/dropbear_0.46.bb
index 80373e3a1b..5bce95a71d 100644
--- a/openembedded/packages/dropbear/dropbear_0.46.bb
+++ b/openembedded/packages/dropbear/dropbear_0.46.bb
@@ -3,14 +3,15 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
3SECTION = "console/network" 3SECTION = "console/network"
4LICENSE = "MIT" 4LICENSE = "MIT"
5DEPENDS = "zlib" 5DEPENDS = "zlib"
6PR = "r3"
7PROVIDES = "ssh sshd" 6PROVIDES = "ssh sshd"
7PR = "r4"
8 8
9SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ 9SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
10 file://urandom-xauth-changes-to-options.h.patch;patch=1 \ 10 file://urandom-xauth-changes-to-options.h.patch;patch=1 \
11 file://configure.patch;patch=1 \ 11 file://configure.patch;patch=1 \
12 file://allow-nopw.patch \ 12 file://allow-nopw.patch \
13 file://fix-2kb-keys.patch;patch=1 \ 13 file://fix-2kb-keys.patch;patch=1 \
14 file://chansession-security-fix.patch;patch=1 \
14 file://init" 15 file://init"
15 16
16inherit autotools update-rc.d 17inherit autotools update-rc.d
diff --git a/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb b/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb
index 199493dc17..e13aac5951 100644
--- a/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
2HOMEPAGE = "http://e2fsprogs.sourceforge.net" 2HOMEPAGE = "http://e2fsprogs.sourceforge.net"
3LICENSE = "GPL" 3LICENSE = "GPL"
4SECTION = "base" 4SECTION = "base"
5PR = "r2" 5PR = "r5"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
8 file://no-hardlinks.patch;patch=1" 8 file://no-hardlinks.patch;patch=1"
@@ -35,7 +35,15 @@ do_stage () {
35 done 35 done
36} 36}
37 37
38PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck" 38# blkid used to be part of e2fsprogs but is useful outside, add it
39# as an RDEPENDS so that anything relying on it being in e2fsprogs
40# still works
41RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen"
42
43PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs"
44FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
45FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
39FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" 46FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
40FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" 47FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
41FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" 48FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
49FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
diff --git a/openembedded/packages/expat/expat_1.95.7.bb b/openembedded/packages/expat/expat_1.95.7.bb
index 95572ce84b..c3bbb8981b 100644
--- a/openembedded/packages/expat/expat_1.95.7.bb
+++ b/openembedded/packages/expat/expat_1.95.7.bb
@@ -2,6 +2,7 @@ SECTION = "libs"
2DESCRIPTION = "Jim Clarkes XML parser library." 2DESCRIPTION = "Jim Clarkes XML parser library."
3HOMEPAGE = "http://expat.sourceforge.net/" 3HOMEPAGE = "http://expat.sourceforge.net/"
4LICENSE = "MIT" 4LICENSE = "MIT"
5PR = "r1"
5 6
6SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
7 file://autotools.patch;patch=1" 8 file://autotools.patch;patch=1"
diff --git a/openembedded/packages/gcc/gcc-package-cross.inc b/openembedded/packages/gcc/gcc-package-cross.inc
index 56299b5157..4b1f8f68e8 100644
--- a/openembedded/packages/gcc/gcc-package-cross.inc
+++ b/openembedded/packages/gcc/gcc-package-cross.inc
@@ -72,6 +72,6 @@ do_install () {
72 if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then 72 if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
73 ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.* 73 ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.*
74 ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* 74 ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.*
75 ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* 75 ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.*
76 fi 76 fi
77} 77}
diff --git a/openembedded/packages/gcc/gcc3-build.inc b/openembedded/packages/gcc/gcc3-build.inc
index a09c6cf1f5..b7523c42f2 100644
--- a/openembedded/packages/gcc/gcc3-build.inc
+++ b/openembedded/packages/gcc/gcc3-build.inc
@@ -47,7 +47,10 @@ CPPFLAGS = ""
47# Used by configure to define additional values for FLAGS_FOR_TARGET - 47# Used by configure to define additional values for FLAGS_FOR_TARGET -
48# passed to all the compilers. 48# passed to all the compilers.
49ARCH_FLAGS_FOR_TARGET = "" 49ARCH_FLAGS_FOR_TARGET = ""
50ARCH_FLAGS_FOR_TARGET_nslu2 = "${TARGET_CC_ARCH}" 50#NOTE: not tested on other platforms, the following is probably correct
51# everywhere!
52ARCH_FLAGS_FOR_TARGET_slugos = "${TARGET_CC_ARCH}"
53ARCH_FLAGS_FOR_TARGET_unslung = "${TARGET_CC_ARCH}"
51EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'" 54EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
52 55
53def get_gcc_fpu_setting(bb, d): 56def get_gcc_fpu_setting(bb, d):
diff --git a/openembedded/packages/gcc/gcc_4.0.2.bb b/openembedded/packages/gcc/gcc_4.0.2.bb
index 856809a7bb..ba64d2421a 100644
--- a/openembedded/packages/gcc/gcc_4.0.2.bb
+++ b/openembedded/packages/gcc/gcc_4.0.2.bb
@@ -5,8 +5,6 @@ SECTION = "devel"
5LICENSE = "GPL" 5LICENSE = "GPL"
6MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" 6MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
7 7
8DEFAULT_PREFERENCE_nslu2 = "-1"
9
10inherit autotools gettext 8inherit autotools gettext
11 9
12include gcc-package.inc 10include gcc-package.inc
diff --git a/openembedded/packages/gdbm/gdbm-native_1.8.3.bb b/openembedded/packages/gdbm/gdbm-native_1.8.3.bb
index 3c99b28857..adfc0459c2 100644
--- a/openembedded/packages/gdbm/gdbm-native_1.8.3.bb
+++ b/openembedded/packages/gdbm/gdbm-native_1.8.3.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gdbm/gdbm.html"
3SECTION = "libs" 3SECTION = "libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r2"
6 7
7SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ 8SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
8 file://makefile.patch;patch=1" 9 file://makefile.patch;patch=1"
diff --git a/openembedded/packages/gdbm/gdbm_1.8.3.bb b/openembedded/packages/gdbm/gdbm_1.8.3.bb
index 650a3079e7..7429f41679 100644
--- a/openembedded/packages/gdbm/gdbm_1.8.3.bb
+++ b/openembedded/packages/gdbm/gdbm_1.8.3.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gdbm/gdbm.html"
3SECTION = "libs" 3SECTION = "libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r2"
6 7
7SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ 8SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
8 file://makefile.patch;patch=1" 9 file://makefile.patch;patch=1"
diff --git a/openembedded/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/openembedded/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index 6615fc39c5..785261e7cf 100644
--- a/openembedded/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/openembedded/packages/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
8PRIORITY = "optional" 8PRIORITY = "optional"
9MAINTAINER = "Philip Blundell <pb@handhelds.org>" 9MAINTAINER = "Philip Blundell <pb@handhelds.org>"
10DEPENDS = "gtk-doc-native" 10DEPENDS = "gtk-doc-native"
11PR = "r0" 11PR = "r3"
12 12
13EXTRA_OECONF = "--disable-debug" 13EXTRA_OECONF = "--disable-debug"
14 14
diff --git a/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
new file mode 100644
index 0000000000..c195aad639
--- /dev/null
+++ b/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
@@ -0,0 +1,16 @@
1--- trunk/backends/xml-backend.c~ 2006-01-18 09:57:39.000000000 -0800
2+++ trunk/backends/xml-backend.c 2006-01-19 11:38:37.000000000 -0800
3@@ -115,6 +115,13 @@
4
5 typedef struct _XMLSource XMLSource;
6
7+extern GConfLock*
8+gconf_get_lock (const gchar *lock_directory,
9+ GError **err);
10+extern gboolean
11+gconf_release_lock (GConfLock *lock,
12+ GError **err);
13+
14 /* XMLSource **/
15
16 struct _XMLSource {
diff --git a/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
new file mode 100644
index 0000000000..312a356c84
--- /dev/null
+++ b/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
@@ -0,0 +1,11 @@
1--- trunk/backends/Makefile~ 2006-01-19 09:52:22.000000000 -0800
2+++ trunk/backends/Makefile 2006-01-19 13:13:23.000000000 -0800
3@@ -84,7 +84,7 @@
4 xml_test_OBJECTS = $(am_xml_test_OBJECTS)
5 xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
6 $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
7- $(top_builddir)/backends/libgconfbackend-oldxml.la
8+ libgconfbackend-oldxml.la
9 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
10 depcomp = $(SHELL) $(top_srcdir)/depcomp
11 am__depfiles_maybe = depfiles
diff --git a/openembedded/packages/gnome/gconf-dbus_svn.bb b/openembedded/packages/gnome/gconf-dbus_svn.bb
index b71d5179cb..d6b79494be 100644
--- a/openembedded/packages/gnome/gconf-dbus_svn.bb
+++ b/openembedded/packages/gnome/gconf-dbus_svn.bb
@@ -12,19 +12,26 @@ PR = "r0"
12 12
13SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ 13SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
14 file://gconf-dbus-update.patch;patch=1;pnum=0 \ 14 file://gconf-dbus-update.patch;patch=1;pnum=0 \
15 file://xml-backend-locks-compile-fix.patch;patch=1 \
16 file://xml-backend-oldxml-Makefile.patch \
15 file://69gconfd-dbus" 17 file://69gconfd-dbus"
16 18
17PARALLEL_MAKE = ""
18
19inherit pkgconfig autotools 19inherit pkgconfig autotools
20S = "${WORKDIR}/trunk" 20S = "${WORKDIR}/trunk"
21 21
22PARALLEL_MAKE = ""
23
22FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" 24FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
23 25
24EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" 26EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
25 27
26HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" 28HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
27 29
30do_compile_prepend() {
31 cd ${S}
32 patch -p1 < ../xml-backend-oldxml-Makefile.patch
33}
34
28do_stage() { 35do_stage() {
29 oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} 36 oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
30 install -d ${STAGING_INCDIR}/gconf/2/gconf/ 37 install -d ${STAGING_INCDIR}/gconf/2/gconf/
diff --git a/openembedded/packages/gnome/gnome-mime-data_2.4.2.bb b/openembedded/packages/gnome/gnome-mime-data_2.4.2.bb
index bf98e1441c..c71f21c9d8 100644
--- a/openembedded/packages/gnome/gnome-mime-data_2.4.2.bb
+++ b/openembedded/packages/gnome/gnome-mime-data_2.4.2.bb
@@ -1,8 +1,7 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2 2inherit gnome
3inherit pkgconfig autotools
4
5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2"
6 3
7DEPENDS += "shared-mime-info intltool-native" 4DEPENDS += "shared-mime-info intltool-native"
8RDEPENDS = "shared-mime-info" 5RDEPENDS = "shared-mime-info"
6
7PR = "r2"
diff --git a/openembedded/packages/gnu-config/gnu-config_20050701.bb b/openembedded/packages/gnu-config/gnu-config_20050701.bb
index 4bc4501ec8..2066014adf 100644
--- a/openembedded/packages/gnu-config/gnu-config_20050701.bb
+++ b/openembedded/packages/gnu-config/gnu-config_20050701.bb
@@ -1,15 +1,14 @@
1SECTION = "base"
2DESCRIPTION = "gnu-configize" 1DESCRIPTION = "gnu-configize"
2SECTION = "base"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "" 4DEPENDS = ""
5INHIBIT_DEFAULT_DEPS = "1" 5INHIBIT_DEFAULT_DEPS = "1"
6MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
7 6
8FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" 7FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
9PV = "0.1+cvs${FIXEDSRCDATE}" 8PV = "0.1+cvs${FIXEDSRCDATE}"
10PR = "r4" 9PR = "r4"
11 10
12SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ 11SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
13 file://config-guess-uclibc.patch;patch=1 \ 12 file://config-guess-uclibc.patch;patch=1 \
14 file://gnu-configize.in" 13 file://gnu-configize.in"
15S = "${WORKDIR}/config" 14S = "${WORKDIR}/config"
diff --git a/openembedded/packages/hostap/hostap-conf_1.0.bb b/openembedded/packages/hostap/hostap-conf_1.0.bb
new file mode 100644
index 0000000000..6c9cb09e60
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-conf_1.0.bb
@@ -0,0 +1,15 @@
1DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
2SECTION = "kernel/modules"
3PRIORITY = "optional"
4LICENSE = "GPL"
5PACKAGE_ARCH = "all"
6PR = "r0"
7
8SRC_URI = "file://hostap_cs.conf \
9 file://hostap_cs.conf-upstream"
10
11do_install() {
12 install -d ${D}${sysconfdir}/pcmcia
13 install -m 0644 ${WORKDIR}/hostap_cs.conf-upstream ${D}${sysconfdir}/pcmcia/hostap_cs.conf
14 cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
15}
diff --git a/openembedded/packages/hostap/hostap-modules_0.3.9.bb b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
index 0f9d7c07b4..940b23863b 100644
--- a/openembedded/packages/hostap/hostap-modules_0.3.9.bb
+++ b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
@@ -3,8 +3,8 @@ 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"
6PROVIDES = "virtual/kernel-hostap" 6PROVIDES = "virtual/kernel-hostap hostap-conf"
7PR = "r6" 7PR = "r8"
8 8
9SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ 9SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
10 file://hostap_cs.conf \ 10 file://hostap_cs.conf \
@@ -45,3 +45,4 @@ FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNE
45FILES_hostap-modules = "/lib/modules/" 45FILES_hostap-modules = "/lib/modules/"
46RDEPENDS_hostap-modules-cs = "hostap-modules" 46RDEPENDS_hostap-modules-cs = "hostap-modules"
47RDEPENDS_hostap-modules-pci = "hostap-modules" 47RDEPENDS_hostap-modules-pci = "hostap-modules"
48RPROVIDES_hostap-modules-cs = "hostap-conf"
diff --git a/openembedded/packages/hostap/hostap-utils_0.3.7.bb b/openembedded/packages/hostap/hostap-utils_0.3.7.bb
index dcf174b930..cdfb0c1e3e 100644
--- a/openembedded/packages/hostap/hostap-utils_0.3.7.bb
+++ b/openembedded/packages/hostap/hostap-utils_0.3.7.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
5MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" 5MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
6LICENSE = "GPL" 6LICENSE = "GPL"
7RDEPENDS = "virtual/kernel-hostap" 7RDEPENDS = "virtual/kernel-hostap"
8PR = "r1" 8PR = "r2"
9 9
10SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ 10SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
11 file://hostap-fw-load.patch;patch=1" 11 file://hostap-fw-load.patch;patch=1"
diff --git a/openembedded/packages/hostap/hostap-utils_0.4.0.bb b/openembedded/packages/hostap/hostap-utils_0.4.0.bb
index cdfb0c1e3e..98254602aa 100644
--- a/openembedded/packages/hostap/hostap-utils_0.4.0.bb
+++ b/openembedded/packages/hostap/hostap-utils_0.4.0.bb
@@ -4,8 +4,9 @@ SECTION = "kernel/userland"
4PRIORITY = "optional" 4PRIORITY = "optional"
5MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" 5MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
6LICENSE = "GPL" 6LICENSE = "GPL"
7RDEPENDS = "virtual/kernel-hostap" 7DEPENDS = "virtual/kernel-hostap"
8PR = "r2" 8RRECOMMENDS = "virtual/kernel-hostap"
9PR = "r3"
9 10
10SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ 11SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
11 file://hostap-fw-load.patch;patch=1" 12 file://hostap-fw-load.patch;patch=1"
diff --git a/openembedded/packages/ice/ice_6.3.3.bb b/openembedded/packages/ice/ice_6.3.3.bb
index 2f0f9a2cce..7722bc4ae5 100644
--- a/openembedded/packages/ice/ice_6.3.3.bb
+++ b/openembedded/packages/ice/ice_6.3.3.bb
@@ -13,5 +13,5 @@ S = "${WORKDIR}/libICE-${PV}"
13inherit autotools pkgconfig 13inherit autotools pkgconfig
14 14
15do_stage () { 15do_stage () {
16 oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} 16 autotools_stage_all
17} 17}
diff --git a/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
index dc45e948df..e6339979e8 100644
--- a/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
+++ b/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
@@ -1,4 +1,4 @@
1keymaps 0-2,4-5 1keymaps 0-2,4-5,8
2keycode 1 = +a +A +a Control_a Control_a 2keycode 1 = +a +A +a Control_a Control_a
3keycode 2 = +b +B underscore Control_b Control_b 3keycode 2 = +b +B underscore Control_b Control_b
4keycode 3 = +c +C +c Control_c Control_c 4keycode 3 = +c +C +c Control_c Control_c
@@ -33,17 +33,17 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
33keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock 33keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
34keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 34keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
35keycode 34 = Escape Escape Escape Escape Escape 35keycode 34 = Escape Escape Escape Escape Escape
36keycode 35 = Left Left Home Left Left 36keycode 35 = Left Left Left Left Left Decr_Console
37keycode 36 = Up Up PageUp Up Up 37keycode 36 = Up Up PageUp Up Up
38keycode 37 = Down Down PageDown Down Down 38keycode 37 = Down Down PageDown Down Down
39keycode 38 = Right Right End Right Right 39keycode 38 = Right Right Right Right Right Incr_Console
40keycode 39 = Return Return Return Return Return 40keycode 39 = Return Return Return Return Return
41keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol 41keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
42keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol 42keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
43keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol 43keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
44keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol 44keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
45keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol 45keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
46keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol 46keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
47keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol 47keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
48keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol 48keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
49keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol 49keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
@@ -57,7 +57,7 @@ keycode 55 = at grave VoidSymbol VoidSymbol
57keycode 56 = Control Control Control Control Control 57keycode 56 = Control Control Control Control Control
58keycode 57 = Alt Alt Alt Alt Alt 58keycode 57 = Alt Alt Alt Alt Alt
59keycode 58 = Control Control Control Control Control 59keycode 58 = Control Control Control Control Control
60keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol 60keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
61keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock 61keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
62keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 62keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
63keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 63keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
@@ -67,7 +67,7 @@ keycode 65 = Tab Tab Caps_Lock Tab
67keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 67keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
68keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 68keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
69keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 69keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
70keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol 70keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
71keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol 71keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
72keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1 72keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
73keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2 73keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2
diff --git a/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
index dc45e948df..e6339979e8 100644
--- a/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
+++ b/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
@@ -1,4 +1,4 @@
1keymaps 0-2,4-5 1keymaps 0-2,4-5,8
2keycode 1 = +a +A +a Control_a Control_a 2keycode 1 = +a +A +a Control_a Control_a
3keycode 2 = +b +B underscore Control_b Control_b 3keycode 2 = +b +B underscore Control_b Control_b
4keycode 3 = +c +C +c Control_c Control_c 4keycode 3 = +c +C +c Control_c Control_c
@@ -33,17 +33,17 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
33keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock 33keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
34keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 34keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
35keycode 34 = Escape Escape Escape Escape Escape 35keycode 34 = Escape Escape Escape Escape Escape
36keycode 35 = Left Left Home Left Left 36keycode 35 = Left Left Left Left Left Decr_Console
37keycode 36 = Up Up PageUp Up Up 37keycode 36 = Up Up PageUp Up Up
38keycode 37 = Down Down PageDown Down Down 38keycode 37 = Down Down PageDown Down Down
39keycode 38 = Right Right End Right Right 39keycode 38 = Right Right Right Right Right Incr_Console
40keycode 39 = Return Return Return Return Return 40keycode 39 = Return Return Return Return Return
41keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol 41keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
42keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol 42keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
43keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol 43keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
44keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol 44keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
45keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol 45keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
46keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol 46keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
47keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol 47keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
48keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol 48keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
49keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol 49keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
@@ -57,7 +57,7 @@ keycode 55 = at grave VoidSymbol VoidSymbol
57keycode 56 = Control Control Control Control Control 57keycode 56 = Control Control Control Control Control
58keycode 57 = Alt Alt Alt Alt Alt 58keycode 57 = Alt Alt Alt Alt Alt
59keycode 58 = Control Control Control Control Control 59keycode 58 = Control Control Control Control Control
60keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol 60keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
61keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock 61keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
62keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 62keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
63keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 63keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
@@ -67,7 +67,7 @@ keycode 65 = Tab Tab Caps_Lock Tab
67keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 67keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
68keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 68keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
69keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 69keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
70keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol 70keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
71keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol 71keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
72keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1 72keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
73keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2 73keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2
diff --git a/openembedded/packages/initscripts/initscripts-1.0/keymap b/openembedded/packages/initscripts/initscripts-1.0/keymap
index 792a31d6da..6ebc634266 100755
--- a/openembedded/packages/initscripts/initscripts-1.0/keymap
+++ b/openembedded/packages/initscripts/initscripts-1.0/keymap
@@ -6,3 +6,11 @@ KERNEL_MAJMIN=`uname -r | cut -d '.' -f 1,2`
6if [ -e /etc/keymap-$KERNEL_MAJMIN.map ]; then 6if [ -e /etc/keymap-$KERNEL_MAJMIN.map ]; then
7 loadkeys /etc/keymap-$KERNEL_MAJMIN.map 7 loadkeys /etc/keymap-$KERNEL_MAJMIN.map
8fi 8fi
9
10if ( ls "/etc" | grep -q "keymap-extension-${KERNEL_MAJMIN}" )
11then
12 for extension in `ls -1 /etc/keymap-extension-$KERNEL_MAJMIN*`
13 do
14 loadkeys "$extension"
15 done
16fi
diff --git a/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
index dc45e948df..e6339979e8 100644
--- a/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
+++ b/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
@@ -1,4 +1,4 @@
1keymaps 0-2,4-5 1keymaps 0-2,4-5,8
2keycode 1 = +a +A +a Control_a Control_a 2keycode 1 = +a +A +a Control_a Control_a
3keycode 2 = +b +B underscore Control_b Control_b 3keycode 2 = +b +B underscore Control_b Control_b
4keycode 3 = +c +C +c Control_c Control_c 4keycode 3 = +c +C +c Control_c Control_c
@@ -33,17 +33,17 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
33keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock 33keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
34keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 34keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
35keycode 34 = Escape Escape Escape Escape Escape 35keycode 34 = Escape Escape Escape Escape Escape
36keycode 35 = Left Left Home Left Left 36keycode 35 = Left Left Left Left Left Decr_Console
37keycode 36 = Up Up PageUp Up Up 37keycode 36 = Up Up PageUp Up Up
38keycode 37 = Down Down PageDown Down Down 38keycode 37 = Down Down PageDown Down Down
39keycode 38 = Right Right End Right Right 39keycode 38 = Right Right Right Right Right Incr_Console
40keycode 39 = Return Return Return Return Return 40keycode 39 = Return Return Return Return Return
41keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol 41keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
42keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol 42keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
43keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol 43keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
44keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol 44keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
45keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol 45keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
46keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol 46keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
47keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol 47keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
48keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol 48keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
49keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol 49keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
@@ -57,7 +57,7 @@ keycode 55 = at grave VoidSymbol VoidSymbol
57keycode 56 = Control Control Control Control Control 57keycode 56 = Control Control Control Control Control
58keycode 57 = Alt Alt Alt Alt Alt 58keycode 57 = Alt Alt Alt Alt Alt
59keycode 58 = Control Control Control Control Control 59keycode 58 = Control Control Control Control Control
60keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol 60keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
61keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock 61keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
62keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 62keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
63keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 63keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
@@ -67,7 +67,7 @@ keycode 65 = Tab Tab Caps_Lock Tab
67keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 67keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
68keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 68keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
69keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol 69keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
70keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol 70keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
71keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol 71keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
72keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1 72keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
73keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2 73keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2
diff --git a/openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
index 5f42a3db51..b27f21e320 100644
--- a/openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
+++ b/openembedded/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
@@ -97,7 +97,7 @@ keycode 91 = space
97keycode 92 = space 97keycode 92 = space
98 control keycode 92 = nul 98 control keycode 92 = nul
99keycode 93 = 99keycode 93 =
100keycode 94 = AltGr 100keycode 94 = exclam
101keycode 95 = semicolon 101keycode 95 = semicolon
102keycode 96 = colon 102keycode 96 = colon
103keycode 97 = bracketright 103keycode 97 = bracketright
@@ -119,7 +119,7 @@ keycode 112 = Shift
119keycode 113 = 119keycode 113 =
120keycode 114 = 120keycode 114 =
121keycode 115 = 121keycode 115 =
122keycode 116 = 122keycode 116 = underscore
123keycode 117 = Control 123keycode 117 = Control
124keycode 118 = 124keycode 118 =
125keycode 119 = 125keycode 119 =
diff --git a/openembedded/packages/initscripts/initscripts_1.0.bb b/openembedded/packages/initscripts/initscripts_1.0.bb
index c5332f23cf..4e11097f89 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 = "r59" 9PR = "r67"
10 10
11SRC_URI = "file://halt \ 11SRC_URI = "file://halt \
12 file://ramdisk \ 12 file://ramdisk \
@@ -128,12 +128,14 @@ do_install () {
128# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom 128# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom
129 ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh 129 ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
130# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs 130# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs
131 # udev will run at S55 if installed
131 ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk 132 ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk
132 ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot 133 ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot
133 ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs 134 ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs
134# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom 135# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom
135 ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh 136 ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
136# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs 137# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs
138 # udev will run at S55 if installed
137 ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt 139 ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt
138 ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner 140 ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner
139 ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh 141 ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh
diff --git a/openembedded/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/openembedded/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
index 2506dbab62..7b66751614 100644
--- a/openembedded/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
+++ b/openembedded/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
@@ -3,6 +3,7 @@ include ipkg-utils_${PV}.bb
3PR = "r4" 3PR = "r4"
4inherit native 4inherit native
5DEPENDS = "" 5DEPENDS = ""
6RDEPENDS = ""
6 7
7do_stage() { 8do_stage() {
8 for i in ${INSTALL}; do 9 for i in ${INSTALL}; do
diff --git a/openembedded/packages/jpeg/jpeg_6b.bb b/openembedded/packages/jpeg/jpeg_6b.bb
index 49e0382b6e..23e3ed82be 100644
--- a/openembedded/packages/jpeg/jpeg_6b.bb
+++ b/openembedded/packages/jpeg/jpeg_6b.bb
@@ -1,3 +1,4 @@
1PR = "r2"
1SECTION = "libs" 2SECTION = "libs"
2PRIORITY = "required" 3PRIORITY = "required"
3MAINTAINER = "Chris Larson <kergoth@handhelds.org>" 4MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
diff --git a/openembedded/packages/libxcursor/libxcursor_1.1.2.bb b/openembedded/packages/libxcursor/libxcursor_1.1.2.bb
index d948ff50d1..25744c7dca 100644
--- a/openembedded/packages/libxcursor/libxcursor_1.1.2.bb
+++ b/openembedded/packages/libxcursor/libxcursor_1.1.2.bb
@@ -14,10 +14,5 @@ FILES_${PN} += "${libdir}/libXcursor.so"
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16do_stage() { 16do_stage() {
17 oe_runmake install prefix=${STAGING_DIR} \ 17 autotools_stage_all
18 bindir=${STAGING_BINDIR} \
19 includedir=${STAGING_INCDIR} \
20 libdir=${STAGING_LIBDIR} \
21 datadir=${STAGING_DATADIR} \
22 mandir=${STAGING_DIR}/man
23} 18}
diff --git a/openembedded/packages/libxfixes/libxfixes_2.0.1.bb b/openembedded/packages/libxfixes/libxfixes_2.0.1.bb
index b6560b8e8b..29e23e379d 100644
--- a/openembedded/packages/libxfixes/libxfixes_2.0.1.bb
+++ b/openembedded/packages/libxfixes/libxfixes_2.0.1.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/libXfixes-${PV}"
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13do_stage() { 13do_stage() {
14 oe_runmake install prefix=${STAGING_DIR} \ 14 autotools_stage_all
15 bindir=${STAGING_BINDIR} \
16 includedir=${STAGING_INCDIR} \
17 libdir=${STAGING_LIBDIR} \
18 datadir=${STAGING_DATADIR}
19} 15}
diff --git a/openembedded/packages/libxfixes/libxfixes_cvs.bb b/openembedded/packages/libxfixes/libxfixes_cvs.bb
index a18ceeb0cc..6a9ae6194f 100644
--- a/openembedded/packages/libxfixes/libxfixes_cvs.bb
+++ b/openembedded/packages/libxfixes/libxfixes_cvs.bb
@@ -10,9 +10,5 @@ S = "${WORKDIR}/Xfixes"
10inherit autotools pkgconfig 10inherit autotools pkgconfig
11 11
12do_stage() { 12do_stage() {
13 oe_runmake install prefix=${STAGING_DIR} \ 13 autotools_stage_all
14 bindir=${STAGING_BINDIR} \
15 includedir=${STAGING_INCDIR} \
16 libdir=${STAGING_LIBDIR} \
17 datadir=${STAGING_DATADIR}
18} 14}
diff --git a/openembedded/packages/libxft/libxft_2.1.6.bb b/openembedded/packages/libxft/libxft_2.1.6.bb
index d7cb351d63..12c8bdfb62 100644
--- a/openembedded/packages/libxft/libxft_2.1.6.bb
+++ b/openembedded/packages/libxft/libxft_2.1.6.bb
@@ -17,12 +17,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
17inherit autotools pkgconfig 17inherit autotools pkgconfig
18 18
19do_stage() { 19do_stage() {
20 oe_runmake install prefix=${STAGING_DIR} \ 20 autotools_stage_all
21 bindir=${STAGING_BINDIR} \
22 includedir=${STAGING_INCDIR} \
23 libdir=${STAGING_LIBDIR} \
24 datadir=${STAGING_DATADIR} \
25 mandir=${STAGING_DATADIR}/man
26} 21}
27 22
28python do_package() { 23python do_package() {
diff --git a/openembedded/packages/libxft/libxft_cvs.bb b/openembedded/packages/libxft/libxft_cvs.bb
index 3827318cdd..6d5c11f36b 100644
--- a/openembedded/packages/libxft/libxft_cvs.bb
+++ b/openembedded/packages/libxft/libxft_cvs.bb
@@ -16,12 +16,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
16inherit autotools pkgconfig 16inherit autotools pkgconfig
17 17
18do_stage() { 18do_stage() {
19 oe_runmake install prefix=${STAGING_DIR} \ 19 autotools_stage_all
20 bindir=${STAGING_BINDIR} \
21 includedir=${STAGING_INCDIR} \
22 libdir=${STAGING_LIBDIR} \
23 datadir=${STAGING_DATADIR} \
24 mandir=${STAGING_DATADIR}/man
25} 20}
26 21
27python do_package() { 22python do_package() {
diff --git a/openembedded/packages/libxi/libxi_6.0.1.bb b/openembedded/packages/libxi/libxi_6.0.1.bb
index b84aef8193..05ad22989f 100644
--- a/openembedded/packages/libxi/libxi_6.0.1.bb
+++ b/openembedded/packages/libxi/libxi_6.0.1.bb
@@ -11,10 +11,6 @@ S = "${WORKDIR}/libXi-${PV}"
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13do_stage() { 13do_stage() {
14 oe_runmake install prefix=${STAGING_DIR} \ 14 autotools_stage_all
15 bindir=${STAGING_BINDIR} \
16 includedir=${STAGING_INCDIR} \
17 libdir=${STAGING_LIBDIR} \
18 datadir=${STAGING_DATADIR}
19} 15}
20 16
diff --git a/openembedded/packages/libxrandr/libxrandr_1.0.2.bb b/openembedded/packages/libxrandr/libxrandr_1.0.2.bb
index 8d646539cb..ff32e0aa35 100644
--- a/openembedded/packages/libxrandr/libxrandr_1.0.2.bb
+++ b/openembedded/packages/libxrandr/libxrandr_1.0.2.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/libXrandr-${PV}"
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13do_stage() { 13do_stage() {
14 oe_runmake install prefix=${STAGING_DIR} \ 14 autotools_stage_all
15 bindir=${STAGING_BINDIR} \
16 includedir=${STAGING_INCDIR} \
17 libdir=${STAGING_LIBDIR} \
18 datadir=${STAGING_DATADIR}
19} 15}
diff --git a/openembedded/packages/libxrender/libxrender_cvs.bb b/openembedded/packages/libxrender/libxrender_cvs.bb
index ca6f16f1b8..c4d26b5c2d 100644
--- a/openembedded/packages/libxrender/libxrender_cvs.bb
+++ b/openembedded/packages/libxrender/libxrender_cvs.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/Xrender"
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13do_stage() { 13do_stage() {
14 oe_runmake install prefix=${STAGING_DIR} \ 14 autotools_stage_all
15 bindir=${STAGING_BINDIR} \
16 includedir=${STAGING_INCDIR} \
17 libdir=${STAGING_LIBDIR} \
18 datadir=${STAGING_DATADIR}
19} 15}
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.15.bb b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
index 3e75c8f9a9..3eae7cbc84 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
@@ -1,6 +1,6 @@
1include linux-openzaurus.inc 1include linux-openzaurus.inc
2 2
3PR = "r3" 3PR = "r5"
4 4
5# Handy URLs 5# Handy URLs
6# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ 6# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -21,22 +21,26 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
21 ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \ 21 ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \
22 ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \ 22 ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \
23 ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \ 23 ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \
24 ${RPSRC}/arm_checksum_memory-r0.patch;patch=1 \
25 ${RPSRC}/pxa_clocks-r0.patch;patch=1 \
24 ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ 26 ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
25 ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \ 27 ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
26 ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \ 28 ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \
27 ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \ 29 ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \
28 ${RPSRC}/led_core-r11.patch;patch=1 \ 30 ${RPSRC}/led_core-r12.patch;patch=1 \
29 ${RPSRC}/led_triggers-r9.patch;patch=1 \ 31 ${RPSRC}/led_triggers-r10.patch;patch=1 \
30 ${RPSRC}/led_trig_timer-r4.patch;patch=1 \ 32 ${RPSRC}/led_trig_timer-r5.patch;patch=1 \
31 ${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 \ 33 ${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 \
32 ${RPSRC}/led_zaurus-r8.patch;patch=1 \ 34 ${RPSRC}/led_zaurus-r9.patch;patch=1 \
33 ${RPSRC}/led_locomo-r5.patch;patch=1 \ 35 ${RPSRC}/led_locomo-r6.patch;patch=1 \
34 ${RPSRC}/led_ixp4xx-r0.patch;patch=1 \ 36 ${RPSRC}/led_ixp4xx-r1.patch;patch=1 \
35 ${RPSRC}/led_tosa-r2.patch;patch=1 \ 37 ${RPSRC}/led_tosa-r3.patch;patch=1 \
36 ${RPSRC}/led_ide-r2.patch;patch=1 \ 38 ${RPSRC}/led_ide-r3.patch;patch=1 \
37 ${RPSRC}/led_nand-r2.patch;patch=1 \ 39 ${RPSRC}/led_nand-r2.patch;patch=1 \
40 ${RPSRC}/ide_end_request-r0.patch;patch=1 \
38 ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ 41 ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
39 ${RPSRC}/pxa_rtc-r3.patch;patch=1 \ 42 ${RPSRC}/rtc_class-r0.patch;patch=1 \
43 ${RPSRC}/rtc_class_pxa-r0.patch;patch=1 \
40 ${RPSRC}/input_power-r4.patch;patch=1 \ 44 ${RPSRC}/input_power-r4.patch;patch=1 \
41 ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ 45 ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
42 ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ 46 ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
@@ -67,11 +71,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
67 ${RPSRC}/zaurus_keyboard_tweak-r0.patch;patch=1 \ 71 ${RPSRC}/zaurus_keyboard_tweak-r0.patch;patch=1 \
68 ${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \ 72 ${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \
69 ${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \ 73 ${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \
70 ${RPSRC}/arm_checksum_memory-r0.patch;patch=1 \
71 ${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \ 74 ${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \
72 ${RPSRC}/pxa_clocks-r0.patch;patch=1 \
73 ${RPSRC}/pm_changes-r0.patch;patch=1 \ 75 ${RPSRC}/pm_changes-r0.patch;patch=1 \
74 ${RPSRC}/sharpsl_pm-do-r1.patch;patch=1 \ 76 ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
77 ${DOSRC}/kexec-arm-r0.patch \
75 file://add-oz-release-string.patch;patch=1 \ 78 file://add-oz-release-string.patch;patch=1 \
76 file://pxa-serial-hack.patch;patch=1 \ 79 file://pxa-serial-hack.patch;patch=1 \
77 ${RPSRC}/pxa-linking-bug.patch;patch=1 \ 80 ${RPSRC}/pxa-linking-bug.patch;patch=1 \
diff --git a/openembedded/packages/module-init-tools/files/ignore_arch_directory b/openembedded/packages/module-init-tools/files/ignore_arch_directory
index 2c71043221..185ea7a3a5 100644
--- a/openembedded/packages/module-init-tools/files/ignore_arch_directory
+++ b/openembedded/packages/module-init-tools/files/ignore_arch_directory
@@ -1,25 +1,24 @@
1diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 1diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
2--- module-init-tools-3.1-pre6.orig/modprobe.8 2004-10-06 02:44:43.000000000 +0200 2--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200
3+++ module-init-tools-3.1-pre6/modprobe.8 2004-10-09 01:39:01.000000000 +0200 3+++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200
4@@ -30,6 +30,7 @@ 4@@ -31,6 +31,7 @@
5 the modules and other files, except for the optional 5 \fI/etc/modprobe.conf\fR configuration file and
6 \fI/etc/modprobe.conf\fR configuration file 6 \fI/etc/modprobe.d\fR directory
7 (see \fBmodprobe.conf\fR(5)). 7 (see \fBmodprobe.conf\fR(5)).
8+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. 8+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
9 .PP 9 .PP
10 Note that this version of \fBmodprobe\fR does not 10 Note that this version of \fBmodprobe\fR does not
11 do anything to the module itself: the work of resolving symbols 11 do anything to the module itself: the work of resolving symbols
12diff -ruN module-init-tools-3.1-pre6.orig/modprobe.c module-init-tools-3.1-pre6/modprobe.c 12--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200
13--- module-init-tools-3.1-pre6.orig/modprobe.c 2004-10-09 01:40:18.000000000 +0200 13+++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200
14+++ module-init-tools-3.1-pre6/modprobe.c 2004-10-09 01:40:11.000000000 +0200 14@@ -1158,6 +1158,10 @@
15@@ -1082,6 +1082,10 @@
16 {
17 DIR *dir; 15 DIR *dir;
16 int ret = 0;
18 17
19+ /* ignore everything in this directory */ 18+ /* ignore everything in this directory */
20+ if (streq(filename, "/etc/modprobe.d/arch")) 19+ if (streq(filename, "/etc/modprobe.d/arch"))
21+ return 1; 20+ return 1;
22+ 21+
23 /* If it's a directory, recurse. */ 22 /* Reiser4 has file/directory duality: treat it as both. */
24 dir = opendir(filename); 23 dir = opendir(filename);
25 if (dir) { 24 if (dir) {
diff --git a/openembedded/packages/module-init-tools/files/manpagesopt b/openembedded/packages/module-init-tools/files/manpagesopt
index 2e9d228d58..5d5cac609e 100644
--- a/openembedded/packages/module-init-tools/files/manpagesopt
+++ b/openembedded/packages/module-init-tools/files/manpagesopt
@@ -1,7 +1,7 @@
1Index: module-init-tools-3.1/configure.in 1Index: module-init-tools-3.2-pre9/configure.in
2=================================================================== 2===================================================================
3--- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500 3--- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000
4+++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500 4+++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000
5@@ -41,5 +41,14 @@ 5@@ -41,5 +41,14 @@
6 fi]) 6 fi])
7 AC_SUBST(MODULE_DIR) 7 AC_SUBST(MODULE_DIR)
@@ -18,22 +18,24 @@ Index: module-init-tools-3.1/configure.in
18+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") 18+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
19 19
20+AC_OUTPUT([Makefile]) 20+AC_OUTPUT([Makefile])
21Index: module-init-tools-3.1/Makefile.am 21Index: module-init-tools-3.2-pre9/Makefile.am
22=================================================================== 22===================================================================
23--- module-init-tools-3.1.orig/Makefile.am 2004-07-12 02:11:46.000000000 -0400 23--- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000
24+++ module-init-tools-3.1/Makefile.am 2005-01-20 02:24:32.155277224 -0500 24+++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000
25@@ -21,11 +21,12 @@ 25@@ -21,13 +21,14 @@
26 MAN5 = modprobe.conf.5 modules.dep.5 26 MAN5 = modprobe.conf.5 modules.dep.5
27 MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 27 MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
28 SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) 28 SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
29-man_MANS = $(MAN5) $(MAN8) 29-man_MANS = $(MAN5) $(MAN8)
30 mandir = $(shell if [ `echo $(prefix)/ | tr -s /` = / ]; then echo /usr/share/man; else echo $(prefix)/man; fi) 30 # If they haven't overridden mandir, fix it (never /man!)
31 mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
31 32
33 TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions
34
35-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
32+if MANPAGES 36+if MANPAGES
33+man_MANS = $(MAN5) $(MAN8) 37+man_MANS = $(MAN5) $(MAN8)
34+endif 38+endif
35 39
36-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ stress_modules.sh install-with-care $(SGML) $(man_MANS)
37
38 sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static 40 sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
39 bin_PROGRAMS = lsmod 41 bin_PROGRAMS = lsmod
diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory
deleted file mode 100644
index 185ea7a3a5..0000000000
--- a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory
+++ /dev/null
@@ -1,24 +0,0 @@
1diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
2--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200
3+++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200
4@@ -31,6 +31,7 @@
5 \fI/etc/modprobe.conf\fR configuration file and
6 \fI/etc/modprobe.d\fR directory
7 (see \fBmodprobe.conf\fR(5)).
8+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
9 .PP
10 Note that this version of \fBmodprobe\fR does not
11 do anything to the module itself: the work of resolving symbols
12--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200
13+++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200
14@@ -1158,6 +1158,10 @@
15 DIR *dir;
16 int ret = 0;
17
18+ /* ignore everything in this directory */
19+ if (streq(filename, "/etc/modprobe.d/arch"))
20+ return 1;
21+
22 /* Reiser4 has file/directory duality: treat it as both. */
23 dir = opendir(filename);
24 if (dir) {
diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt
deleted file mode 100644
index 5d5cac609e..0000000000
--- a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt
+++ /dev/null
@@ -1,41 +0,0 @@
1Index: module-init-tools-3.2-pre9/configure.in
2===================================================================
3--- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000
4+++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000
5@@ -41,5 +41,14 @@
6 fi])
7 AC_SUBST(MODULE_DIR)
8
9-AC_OUTPUT([Makefile])
10+AC_ARG_ENABLE(manpages,
11+[ --disable-manpages Disable man page generation.],
12+[if test x"$enableval" != x"no"; then
13+ enable_manpages=yes
14+else
15+ enable_manpages=no
16+fi],
17+[enable_manpages=yes])
18+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
19
20+AC_OUTPUT([Makefile])
21Index: module-init-tools-3.2-pre9/Makefile.am
22===================================================================
23--- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000
24+++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000
25@@ -21,13 +21,14 @@
26 MAN5 = modprobe.conf.5 modules.dep.5
27 MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
28 SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
29-man_MANS = $(MAN5) $(MAN8)
30 # If they haven't overridden mandir, fix it (never /man!)
31 mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
32
33 TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions
34
35-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
36+if MANPAGES
37+man_MANS = $(MAN5) $(MAN8)
38+endif
39
40 sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
41 bin_PROGRAMS = lsmod
diff --git a/openembedded/packages/module-init-tools/module-init-tools-cross_3.1.bb b/openembedded/packages/module-init-tools/module-init-tools-cross_3.1.bb
deleted file mode 100644
index 56fec56072..0000000000
--- a/openembedded/packages/module-init-tools/module-init-tools-cross_3.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1LICENSE = "GPL"
2include module-init-tools_${PV}.bb
3inherit cross
4DEFAULT_PREFERENCE = "0"
5PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
6
7PR="r3"
8
9# When cross compiling depmod as shipped cannot handle endian
10# differences between host and target, this fixes the problem.
11# It also solves any possible issues with alignment (only likely
12# if cross compiling for a low alignment target - e.g. x86, on
13# a high alignment host - e.g. SPARC).
14SRC_URI += " file://depmod-byteswap.patch;patch=1 "
15
16EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
17
18do_stage () {
19 oe_runmake install
20}
21
22do_install () {
23 :
24}
diff --git a/openembedded/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/openembedded/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
new file mode 100644
index 0000000000..4bcc311709
--- /dev/null
+++ b/openembedded/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -0,0 +1,15 @@
1LICENSE = "GPL"
2include module-init-tools_${PV}.bb
3inherit cross
4DEFAULT_PREFERENCE = "0"
5PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
6
7EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
8
9do_stage () {
10 oe_runmake install
11}
12
13do_install () {
14 :
15}
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.1.bb b/openembedded/packages/module-init-tools/module-init-tools_3.2.2.bb
index bbd8cca1bf..bbd8cca1bf 100644
--- a/openembedded/packages/module-init-tools/module-init-tools_3.2.1.bb
+++ b/openembedded/packages/module-init-tools/module-init-tools_3.2.2.bb
diff --git a/openembedded/packages/openswan/openswan_2.2.0.bb b/openembedded/packages/openswan/openswan_2.2.0.bb
index d10f55f583..197fed95f6 100644
--- a/openembedded/packages/openswan/openswan_2.2.0.bb
+++ b/openembedded/packages/openswan/openswan_2.2.0.bb
@@ -7,9 +7,9 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
7DEPENDS = "gmp flex-native" 7DEPENDS = "gmp flex-native"
8RRECOMMENDS = "kernel-module-ipsec" 8RRECOMMENDS = "kernel-module-ipsec"
9RDEPENDS_nylon = "perl" 9RDEPENDS_nylon = "perl"
10PR = "r5" 10PR = "r4"
11 11
12SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \ 12SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
13 file://openswan-2.2.0-gentoo.patch;patch=1 \ 13 file://openswan-2.2.0-gentoo.patch;patch=1 \
14 file://gcc4-fixes.patch;patch=1 \ 14 file://gcc4-fixes.patch;patch=1 \
15 file://makefile-whitespace-fix.patch;patch=1 \ 15 file://makefile-whitespace-fix.patch;patch=1 \
diff --git a/openembedded/packages/orinoco/spectrum-fw.bb b/openembedded/packages/orinoco/spectrum-fw.bb
index 1d388332a5..dd76000ed1 100644
--- a/openembedded/packages/orinoco/spectrum-fw.bb
+++ b/openembedded/packages/orinoco/spectrum-fw.bb
@@ -1,6 +1,7 @@
1DESCRIPTION = "Firmware for Spectrum Wireless LAN cards" 1DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
2LICENSE = "unknown" 2LICENSE = "unknown"
3PR = "r0" 3PR = "r0"
4PACKAGE_ARCH = "all"
4 5
5SRC_URI = "file://get_symbol_fw \ 6SRC_URI = "file://get_symbol_fw \
6 file://parse_symbol_fw" 7 file://parse_symbol_fw"
diff --git a/openembedded/packages/pcmcia-cs/files/arm/pcmcia b/openembedded/packages/pcmcia-cs/files/arm/pcmcia
index 05b381a5f9..d5346fb13a 100644
--- a/openembedded/packages/pcmcia-cs/files/arm/pcmcia
+++ b/openembedded/packages/pcmcia-cs/files/arm/pcmcia
@@ -9,11 +9,9 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
9 case "`uname -r`" in 9 case "`uname -r`" in
10 2.4*) 10 2.4*)
11 PCIC=pxa_cs 11 PCIC=pxa_cs
12 DS=ds
13 ;; 12 ;;
14 2.6*) 13 2.6*)
15 PCIC=pxa2xx_core 14 PCIC=pxa2xx_core
16 DS=pcmcia
17 ;; 15 ;;
18 esac 16 esac
19 ;; 17 ;;
@@ -26,6 +24,15 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
26 ;; 24 ;;
27esac 25esac
28 26
27case "`uname -r`" in
28 2.4*)
29 DS=ds
30 ;;
31 2.6*)
32 DS=pcmcia
33 ;;
34esac
35
29case `module_id` in 36case `module_id` in
30 "HP iPAQ H3"* | "HP iPAQ H5"*) 37 "HP iPAQ H3"* | "HP iPAQ H5"*)
31 PCIC_EXTRA=h3600_generic_sleeve 38 PCIC_EXTRA=h3600_generic_sleeve
diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index e0ebf70d93..1db3006e14 100644
--- a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,7 +3,7 @@ SECTION = "base"
3PRIORITY = "required" 3PRIORITY = "required"
4LICENSE = "GPL" 4LICENSE = "GPL"
5DEPENDS = "virtual/kernel" 5DEPENDS = "virtual/kernel"
6PR = "r23" 6PR = "r27"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
9 file://busybox.patch;patch=1 \ 9 file://busybox.patch;patch=1 \
diff --git a/openembedded/packages/perl/perl_5.8.7.bb b/openembedded/packages/perl/perl_5.8.7.bb
index e78a4829af..a960439ad2 100644
--- a/openembedded/packages/perl/perl_5.8.7.bb
+++ b/openembedded/packages/perl/perl_5.8.7.bb
@@ -53,7 +53,7 @@ RPROVIDES_perl-lib = "perl-lib"
53include perl-rdepends_${PV}.inc 53include perl-rdepends_${PV}.inc
54 54
55# To create/update the perl-rdepends_${PV}.inc use this piece of ugly script (modified for your arch/paths etc): 55# To create/update the perl-rdepends_${PV}.inc use this piece of ugly script (modified for your arch/paths etc):
56# daka@DaKa2:/home/slug/openslug/tmp/work/perl-5.8.7-r14/install$ egrep -r "use|require" * | grep ";$" | egrep ".pm:use |.pm:require " | grep -v v5.6.0 | grep -v 5.00 | grep -v \$module | sed -e "s, \+, ,g" | cut -f1,2 -d" " | sed -e "s,;, ,g" | sed -e "s,(), ,g" | sed -e "s,::,-,g" | sort | uniq | tr [:upper:] [:lower:] | sed -e "s,/[^ ]\+ , += \"perl-module-,g" | sed -e "s, \?$, \",g" | sed -e "s,_,-,g" | sed -e "s,^,RDEPENDS_,g" | sed -e "s,armeb-linux,\$\{TARGET_ARCH\}-\$\{TARGET_OS\},g" | egrep -v "perl-module-5|perl-module-tk|perl-module-mac-internetconfig|perl-module-ndbm-file|perl-module-html-treebuilder|perl-module-lwp-simple|perl-module-vms-filespec|perl-module-fcgi|perl-module-vms-stdio|perl-module-mac-buildtools" > /home/slug/openembedded/packages/perl/perl-rdepends_5.8.7.inc 56# daka@DaKa2:/home/slug/slugos/tmp/work/perl-5.8.7-r14/install$ egrep -r "use|require" * | grep ";$" | egrep ".pm:use |.pm:require " | grep -v v5.6.0 | grep -v 5.00 | grep -v \$module | sed -e "s, \+, ,g" | cut -f1,2 -d" " | sed -e "s,;, ,g" | sed -e "s,(), ,g" | sed -e "s,::,-,g" | sort | uniq | tr [:upper:] [:lower:] | sed -e "s,/[^ ]\+ , += \"perl-module-,g" | sed -e "s, \?$, \",g" | sed -e "s,_,-,g" | sed -e "s,^,RDEPENDS_,g" | sed -e "s,armeb-linux,\$\{TARGET_ARCH\}-\$\{TARGET_OS\},g" | egrep -v "perl-module-5|perl-module-tk|perl-module-mac-internetconfig|perl-module-ndbm-file|perl-module-html-treebuilder|perl-module-lwp-simple|perl-module-vms-filespec|perl-module-fcgi|perl-module-vms-stdio|perl-module-mac-buildtools" > /home/slug/openembedded/packages/perl/perl-rdepends_5.8.7.inc
57 57
58# Some packages changed names in 5.8.7-r14, RPROVIDE them 58# Some packages changed names in 5.8.7-r14, RPROVIDE them
59RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata" 59RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
diff --git a/openembedded/packages/popt/popt_1.7.bb b/openembedded/packages/popt/popt_1.7.bb
index 41af18ed58..6984dbdb13 100644
--- a/openembedded/packages/popt/popt_1.7.bb
+++ b/openembedded/packages/popt/popt_1.7.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
2DESCRIPTION = "The popt library exists essentially \ 2DESCRIPTION = "The popt library exists essentially \
3for parsing command line options." 3for parsing command line options."
4LICENSE = "MIT" 4LICENSE = "MIT"
5PR = "r1" 5PR = "r3"
6 6
7SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \ 7SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
8 file://m4.patch;patch=1 \ 8 file://m4.patch;patch=1 \
diff --git a/openembedded/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch b/openembedded/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch
new file mode 100644
index 0000000000..574abfaf2c
--- /dev/null
+++ b/openembedded/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch
@@ -0,0 +1,19 @@
1--- ppp-2.4.3/pppd/Makefile.linux.orig 2006-01-17 15:09:56.000000000 +0000
2+++ ppp-2.4.3/pppd/Makefile.linux 2006-01-17 15:10:21.000000000 +0000
3@@ -117,12 +117,12 @@
4 #LIBS += -lshadow $(LIBS)
5 endif
6
7-ifneq ($(wildcard /usr/include/crypt.h),)
8+#ifneq ($(wildcard /usr/include/crypt.h),)
9 CFLAGS += -DHAVE_CRYPT_H=1
10-endif
11-ifneq ($(wildcard /usr/lib/libcrypt.*),)
12+#endif
13+#ifneq ($(wildcard /usr/lib/libcrypt.*),)
14 LIBS += -lcrypt
15-endif
16+#endif
17
18 ifdef NEEDDES
19 ifndef USE_CRYPT
diff --git a/openembedded/packages/ppp/ppp_2.4.3.bb b/openembedded/packages/ppp/ppp_2.4.3.bb
index 8701efc556..b8253a1a5a 100644
--- a/openembedded/packages/ppp/ppp_2.4.3.bb
+++ b/openembedded/packages/ppp/ppp_2.4.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
3HOMEPAGE = "http://samba.org/ppp/" 3HOMEPAGE = "http://samba.org/ppp/"
4DEPENDS = "libpcap" 4DEPENDS = "libpcap"
5LICENSE = "BSD GPLv2" 5LICENSE = "BSD GPLv2"
6PR = "r0" 6PR = "r1"
7 7
8SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ 8SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
9 file://makefile.patch;patch=1 \ 9 file://makefile.patch;patch=1 \
@@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
12 file://plugins-fix-CC.patch;patch=1 \ 12 file://plugins-fix-CC.patch;patch=1 \
13 file://pppoatm-makefile.patch;patch=1 \ 13 file://pppoatm-makefile.patch;patch=1 \
14 file://enable-ipv6.patch;patch=1 \ 14 file://enable-ipv6.patch;patch=1 \
15 file://makefile-remove-hard-usr-reference.patch;patch=1 \
15 file://pon \ 16 file://pon \
16 file://poff \ 17 file://poff \
17 file://init \ 18 file://init \
@@ -24,7 +25,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
24inherit autotools 25inherit autotools
25 26
26EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin" 27EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
27EXTRA_OECONF = --disable-strip 28EXTRA_OECONF = "--disable-strip"
28 29
29do_install_append () { 30do_install_append () {
30 make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp 31 make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
@@ -60,7 +61,7 @@ DESCRIPTION_ppp-password = "Plugin for PPP to get passwords via a pipe"
60DESCRIPTION_ppp-tools = "The pppdump and pppstats utitilities" 61DESCRIPTION_ppp-tools = "The pppdump and pppstats utitilities"
61RDEPENDS_ppp_minconn += "libpcap0.8" 62RDEPENDS_ppp_minconn += "libpcap0.8"
62 63
63pkg_postinst() { 64pkg_postinst_${PN}() {
64if test "x$D" != "x"; then 65if test "x$D" != "x"; then
65 exit 1 66 exit 1
66else 67else
diff --git a/openembedded/packages/prism3-support/files/hostap-fw-load b/openembedded/packages/prism3-support/files/hostap-fw-load
index 538a4a7836..0b2aec51a8 100644
--- a/openembedded/packages/prism3-support/files/hostap-fw-load
+++ b/openembedded/packages/prism3-support/files/hostap-fw-load
@@ -2,6 +2,8 @@
2 2
3# Special case for prism3 cards needing firmware upload 3# Special case for prism3 cards needing firmware upload
4# Add more known manfids, if necessary 4# Add more known manfids, if necessary
5
6test -x /sbin/cardctl || exit 0
5 7
6if [ `cardctl info|grep "d601,0010\|d601,0101"` ]; then 8if [ `cardctl info|grep "d601,0010\|d601,0101"` ]; then
7 iwpriv "$IFACE" reset 1 9 iwpriv "$IFACE" reset 1
diff --git a/openembedded/packages/prism3-support/prism3-support_1.0.0.bb b/openembedded/packages/prism3-support/prism3-support_1.0.0.bb
index 031fdf7e9c..dfe3f5a9fb 100644
--- a/openembedded/packages/prism3-support/prism3-support_1.0.0.bb
+++ b/openembedded/packages/prism3-support/prism3-support_1.0.0.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
4DEPENDS = "prism3-firmware hostap-utils" 4DEPENDS = "prism3-firmware hostap-utils"
5RDEPENDS = "prism3-firmware hostap-utils" 5RDEPENDS = "prism3-firmware hostap-utils"
6MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" 6MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
7PR = "r1"
7PACKAGE_ARCH = "all" 8PACKAGE_ARCH = "all"
8PR = "r0"
9 9
10SRC_URI = "file://hostap-fw-load" 10SRC_URI = "file://hostap-fw-load"
11 11
diff --git a/openembedded/packages/tslib/tslib-maemo_0.0.1-15.bb b/openembedded/packages/tslib/tslib-maemo_0.0.1-15.bb
index 6bc844e8dd..1c91485ed0 100644
--- a/openembedded/packages/tslib/tslib-maemo_0.0.1-15.bb
+++ b/openembedded/packages/tslib/tslib-maemo_0.0.1-15.bb
@@ -5,7 +5,7 @@ PR = "r1"
5PROVIDES = "tslib" 5PROVIDES = "tslib"
6 6
7SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" 7SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
8PACKAGE_ARCH_tslib-conf = "${MACHINE}" 8PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
9 9
10SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \ 10SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \
11 file://ts.conf \ 11 file://ts.conf \
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index d13614c3ae..cd2d65f515 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -4,8 +4,8 @@ PV = "0.0+cvs${SRCDATE}"
4PR = "r32" 4PR = "r32"
5 5
6SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" 6SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
7PACKAGE_ARCH_tslib-conf = "${MACHINE}" 7PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
8PACKAGE_ARCH_mnci = "${MACHINE}" 8PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
9 9
10SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ 10SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
11 file://ts.conf \ 11 file://ts.conf \
@@ -27,10 +27,7 @@ EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-
27EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " 27EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
28 28
29do_stage () { 29do_stage () {
30 oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR} 30autotools_stage_all
31 ln -sf libts-0.0.so ${STAGING_LIBDIR}/libts.so
32 install -m 0644 src/tslib.h ${STAGING_INCDIR}/
33 install -m 0644 src/tslib-private.h ${STAGING_INCDIR}/
34} 31}
35 32
36do_install_prepend () { 33do_install_prepend () {
@@ -41,7 +38,7 @@ do_install_append() {
41 install -d ${D}${sysconfdir}/profile.d/ 38 install -d ${D}${sysconfdir}/profile.d/
42 install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ 39 install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
43 case ${MACHINE} in 40 case ${MACHINE} in
44 h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270) 41 h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel)
45 install -d ${D}${datadir}/tslib 42 install -d ${D}${datadir}/tslib
46 for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do 43 for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do
47 install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ 44 install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
diff --git a/openembedded/packages/udev/udev-084/init b/openembedded/packages/udev/udev-084/init
index d3983df6bc..3138e5554c 100644
--- a/openembedded/packages/udev/udev-084/init
+++ b/openembedded/packages/udev/udev-084/init
@@ -56,7 +56,7 @@ mount_tmpfs() {
56# I hate this hack. -- Md 56# I hate this hack. -- Md
57make_extra_nodes() { 57make_extra_nodes() {
58 if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then 58 if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
59 cp --preserve=all --recursive --update /lib/udev/devices/* /dev/ 59 cp -a /lib/udev/devices/* /dev/
60 fi 60 fi
61 61
62 [ -e /etc/udev/links.conf ] || return 0 62 [ -e /etc/udev/links.conf ] || return 0
diff --git a/openembedded/packages/udev/udev-084/udev.rules b/openembedded/packages/udev/udev-084/udev.rules
index b3a19cefc8..6308cb0918 100644
--- a/openembedded/packages/udev/udev-084/udev.rules
+++ b/openembedded/packages/udev/udev-084/udev.rules
@@ -95,4 +95,4 @@ KERNEL=="device-mapper", NAME="mapper/control"
95KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" 95KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
96 96
97# Firmware Helper 97# Firmware Helper
98ACTION=="add", SUBSYSTEM=="firmware", RUN+="/usr/lib/udev/firmware_helper" 98ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
diff --git a/openembedded/packages/udev/udev_084.bb b/openembedded/packages/udev/udev_084.bb
index b5bf464250..904f73783c 100644
--- a/openembedded/packages/udev/udev_084.bb
+++ b/openembedded/packages/udev/udev_084.bb
@@ -1,3 +1,5 @@
1DEFAULT_PREFERENCE = "-1"
2
1DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ 3DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
2/dev/, handles hotplug events and loads drivers at boot time. It replaces \ 4/dev/, handles hotplug events and loads drivers at boot time. It replaces \
3the hotplug package and requires a kernel not older than 2.6.12." 5the hotplug package and requires a kernel not older than 2.6.12."
@@ -15,7 +17,9 @@ INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ."
15 17
16PR = "r1" 18PR = "r1"
17 19
20FILES_${PN} += "${base_libdir}"
18UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" 21UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
22EXTRA_OEMAKE += "libudevdir=/lib/udev"
19 23
20do_install () { 24do_install () {
21 install -d ${D}${usrsbindir} \ 25 install -d ${D}${usrsbindir} \
diff --git a/openembedded/packages/xau/xau_0.1.1.bb b/openembedded/packages/xau/xau_0.1.1.bb
index aa2c0ec858..3c8b4a030b 100644
--- a/openembedded/packages/xau/xau_0.1.1.bb
+++ b/openembedded/packages/xau/xau_0.1.1.bb
@@ -13,9 +13,5 @@ S = "${WORKDIR}/libXau-${PV}"
13inherit autotools pkgconfig 13inherit autotools pkgconfig
14 14
15do_stage() { 15do_stage() {
16 oe_runmake install prefix=${STAGING_DIR} \ 16 autotools_stage_all
17 bindir=${STAGING_BINDIR} \
18 includedir=${STAGING_INCDIR} \
19 libdir=${STAGING_LIBDIR} \
20 datadir=${STAGING_DATADIR}
21} 17}
diff --git a/openembedded/packages/xau/xau_cvs.bb b/openembedded/packages/xau/xau_cvs.bb
index 58c47dd62f..46958baf19 100644
--- a/openembedded/packages/xau/xau_cvs.bb
+++ b/openembedded/packages/xau/xau_cvs.bb
@@ -13,10 +13,5 @@ S = "${WORKDIR}/Xau"
13inherit autotools pkgconfig 13inherit autotools pkgconfig
14 14
15do_stage() { 15do_stage() {
16 oe_runmake install prefix=${STAGING_DIR} \ 16 autotools_stage_all
17 bindir=${STAGING_BINDIR} \
18 includedir=${STAGING_INCDIR} \
19 libdir=${STAGING_LIBDIR} \
20 datadir=${STAGING_DATADIR} \
21 mandir=${STAGING_DATADIR}/man
22} 17}
diff --git a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
index f28e0edf42..31a60a3202 100644
--- a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
2LICENSE = "BSD-X" 2LICENSE = "BSD-X"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5MAINTAINER = "Phil Blundell <pb@freedesktop.org>"
6DEPENDS = "x11 xcalibrateext xext" 5DEPENDS = "x11 xcalibrateext xext"
7DESCRIPTION = "XCalibrate client-side library" 6DESCRIPTION = "XCalibrate client-side library"
8 7
@@ -12,9 +11,5 @@ S = "${WORKDIR}/XCalibrate"
12inherit autotools pkgconfig 11inherit autotools pkgconfig
13 12
14do_stage() { 13do_stage() {
15 oe_runmake install prefix=${STAGING_DIR} \ 14 autotools_stage_all
16 bindir=${STAGING_BINDIR} \
17 includedir=${STAGING_INCDIR} \
18 libdir=${STAGING_LIBDIR} \
19 datadir=${STAGING_DATADIR}
20} 15}
diff --git a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
index e242564233..133d19ee36 100644
--- a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
+++ b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
@@ -1,7 +1,6 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2SECTION = "x11/libs" 2SECTION = "x11/libs"
3LICENSE = "BSD-X" 3LICENSE = "BSD-X"
4MAINTAINER = "Phil Blundell <pb@handhelds.org>"
5DESCRIPTION = "XCalibrate extension headers" 4DESCRIPTION = "XCalibrate extension headers"
6 5
7SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt" 6SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt"
@@ -10,9 +9,5 @@ S = "${WORKDIR}/XCalibrateExt"
10inherit autotools pkgconfig 9inherit autotools pkgconfig
11 10
12do_stage() { 11do_stage() {
13 oe_runmake install prefix=${STAGING_DIR} \ 12 autotools_stage_all
14 bindir=${STAGING_BINDIR} \
15 includedir=${STAGING_INCDIR} \
16 libdir=${STAGING_LIBDIR} \
17 datadir=${STAGING_DATADIR}
18} 13}
diff --git a/openembedded/packages/xcomposite/xcomposite_cvs.bb b/openembedded/packages/xcomposite/xcomposite_cvs.bb
index e0a7e2b647..8469e9c366 100644
--- a/openembedded/packages/xcomposite/xcomposite_cvs.bb
+++ b/openembedded/packages/xcomposite/xcomposite_cvs.bb
@@ -10,9 +10,5 @@ S = "${WORKDIR}/Xcomposite"
10inherit autotools pkgconfig 10inherit autotools pkgconfig
11 11
12do_stage() { 12do_stage() {
13 oe_runmake install prefix=${STAGING_DIR} \ 13 autotools_stage_all
14 bindir=${STAGING_BINDIR} \
15 includedir=${STAGING_INCDIR} \
16 libdir=${STAGING_LIBDIR} \
17 datadir=${STAGING_DATADIR}
18} 14}
diff --git a/openembedded/packages/xmu/xmu_cvs.bb b/openembedded/packages/xmu/xmu_cvs.bb
index 7cf267dbb8..3f62a89643 100644
--- a/openembedded/packages/xmu/xmu_cvs.bb
+++ b/openembedded/packages/xmu/xmu_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
2LICENSE = "MIT" 2LICENSE = "MIT"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5MAINTAINER = "Phil Blundell <pb@handhelds.org>"
6DEPENDS = "xt xext" 5DEPENDS = "xt xext"
7PR = "r2" 6PR = "r2"
8 7
@@ -17,5 +16,5 @@ FILES_xmuu-dev = "${libdir}/libXmuu.so"
17inherit autotools pkgconfig 16inherit autotools pkgconfig
18 17
19do_stage () { 18do_stage () {
20 oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} 19 autotools_stage_all
21} 20}
diff --git a/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb b/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb
index 33241b3d0d..a5a92fee40 100644
--- a/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb
+++ b/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb
@@ -9,10 +9,5 @@ S = "${WORKDIR}/Xproto"
9inherit autotools pkgconfig 9inherit autotools pkgconfig
10 10
11do_stage() { 11do_stage() {
12 oe_runmake install prefix=${STAGING_DIR} \ 12 autotools_stage_all
13 bindir=${STAGING_BINDIR} \
14 includedir=${STAGING_INCDIR} \
15 libdir=${STAGING_LIBDIR} \
16 mandir=${STAGING_DATADIR}/man \
17 datadir=${STAGING_DATADIR}
18} 13}
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index f56497cebd..16ac1049b6 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,13 +1,14 @@
1DESCRIPTION = "Common X11 scripts" 1DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
5RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" 4RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
6PR = "r2" 5PR = "r3"
7 6
8SRC_URI = "file://etc" 7SRC_URI = "file://etc"
9S = ${WORKDIR} 8S = ${WORKDIR}
10 9
10PACKAGE_ARCH = "all"
11
11do_install() { 12do_install() {
12 cp -R ${S}/etc ${D}/etc 13 cp -R ${S}/etc ${D}/etc
13 chmod -R 755 ${D}/etc 14 chmod -R 755 ${D}/etc
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
index d7aad8b4d9..3ea41de7f5 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
@@ -7,6 +7,8 @@ PR = "r0"
7SRC_URI = "file://xserver-nodm" 7SRC_URI = "file://xserver-nodm"
8S = ${WORKDIR} 8S = ${WORKDIR}
9 9
10PACKAGE_ARCH = "all"
11
10do_install() { 12do_install() {
11 install -d ${D}/etc 13 install -d ${D}/etc
12 install -d ${D}/etc/init.d 14 install -d ${D}/etc/init.d