summaryrefslogtreecommitdiff
path: root/openembedded
diff options
context:
space:
mode:
Diffstat (limited to 'openembedded')
-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 db479d584..fd8d1b7b0 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
bb.data.setVar('PACKAGES', ' '.join(packages), d)
+# Function to strip a single file, called from RUNSTRIP below
+# A working 'file' (one which works on the target architecture)
+# is necessary for this stuff to work.
+PACKAGE_DEPENDS ?= "file-native"
+DEPENDS_prepend =+ "${PACKAGE_DEPENDS} "
+#FIXME: this should be "" when any errors are gone!
+IGNORE_STRIP_ERRORS ?= "1"
+
+runstrip() {
+ local ro st
+ st=0
+ if { file "$1" || {
+ oewarn "file $1: failed (forced strip)" >&2
+ echo 'not stripped'
+ }
+ } | grep -q 'not stripped'
+ then
+ oenote "${STRIP} $1"
+ ro=
+ test -w "$1" || {
+ ro=1
+ chmod +w "$1"
+ }
+ '${STRIP}' "$1"
+ st=$?
+ test -n "$ro" && chmod -w "$1"
+ if test $st -ne 0
+ then
+ oewarn "runstrip: ${STRIP} $1: strip failed" >&2
+ if [ x${IGNORE_STRIP_ERRORS} == x1 ]
+ then
+ #FIXME: remove this, it's for error detection
+ if file "$1" 2>/dev/null >&2
+ then
+ (oefatal "${STRIP} $1: command failed" >/dev/tty)
+ else
+ (oefatal "file $1: command failed" >/dev/tty)
+ fi
+ st=0
+ fi
+ fi
+ else
+ oenote "runstrip: skip $1"
+ fi
+ return $st
+}
+
python populate_packages () {
import glob, stat, errno, re
@@ -166,14 +213,14 @@ python populate_packages () {
dpath = os.path.dirname(fpath)
bb.mkdirhier(dpath)
if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file):
- stripfunc += "${STRIP} %s || : ;\n" % fpath
+ stripfunc += "\trunstrip %s || st=1\n" % fpath
ret = bb.movefile(file,fpath)
if ret is None or ret == 0:
raise bb.build.FuncFailed("File population failed")
if not stripfunc == "":
from bb import build
# strip
- bb.data.setVar('RUNSTRIP', '%s\nreturn 0' % stripfunc, localdata)
+ bb.data.setVar('RUNSTRIP', '\tlocal st\n\tst=0\n%s\treturn $st' % stripfunc, localdata)
bb.data.setVarFlag('RUNSTRIP', 'func', 1, localdata)
bb.build.exec_func('RUNSTRIP', localdata)
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 f8af96435..933195977 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"
PREFERRED_VERSION_atk ?= "1.9.0"
PREFERRED_VERSION_cairo ?= "0.5.2"
PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
-PREFERRED_VERSION_gtk+ ?= "2.6.7"
+PREFERRED_VERSION_gtk+ ?= "2.6.10"
PREFERRED_VERSION_pango ?= "1.8.1"
PREFERRED_VERSION_librsvg ?= "2.6.5"
-PREFERRED_VERSION_libgpewidget ?= "0.105"
+PREFERRED_VERSION_libgpewidget ?= "0.109"
PREFERRED_VERSION_libgpepimc ?= "0.5"
PREFERRED_VERSION_libgpevtype ?= "0.14"
PREFERRED_VERSION_libschedule ?= "0.15"
+PREFERRED_VERSION_libcontactsdb ?= "0.3"
+PREFERRED_VERSION_libtododb ?= "0.09"
PREFERRED_VERSION_gpe-icons ?= "0.25"
PREFERRED_VERSION_libgsm ?= "1.0.10"
PREFERRED_VERSION_diet-x11 ?= "6.2.1"
@@ -43,23 +45,23 @@ PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
PREFERRED_VERSION_gpe-login ?= "0.83"
PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
-PREFERRED_VERSION_gpe-todo ?= "0.54"
-PREFERRED_VERSION_gpe-calendar ?= "0.66"
-PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
-PREFERRED_VERSION_gpe-contacts ?= "0.42"
+PREFERRED_VERSION_gpe-todo ?= "0.55"
+PREFERRED_VERSION_gpe-calendar ?= "0.70"
+PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
+PREFERRED_VERSION_gpe-contacts ?= "0.43"
PREFERRED_VERSION_gpe-today ?= "0.10"
PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
PREFERRED_VERSION_dbus ?= "0.23.4"
PREFERRED_VERSION_gpe-beam ?= "0.2.8"
-PREFERRED_VERSION_gpe-bluetooth ?= "0.47"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.51"
PREFERRED_VERSION_gpe-su ?= "0.19"
-PREFERRED_VERSION_gpe-conf ?= "0.1.26"
-PREFERRED_VERSION_gpe-clock ?= "0.21"
-PREFERRED_VERSION_gpe-mininet ?= "0.5"
+PREFERRED_VERSION_gpe-conf ?= "0.1.29"
+PREFERRED_VERSION_gpe-clock ?= "0.23"
+PREFERRED_VERSION_gpe-mininet ?= "0.7"
PREFERRED_VERSION_gpe-mixer ?= "0.42"
PREFERRED_VERSION_gpe-shield ?= "0.8"
PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager ?= "0.18"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.19"
PREFERRED_VERSION_keylaunch ?= "2.0.7"
PREFERRED_VERSION_minilite ?= "0.49"
PREFERRED_VERSION_xmonobut ?= "0.4"
@@ -70,7 +72,7 @@ PREFERRED_VERSION_gpe-package ?= "0.3"
PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
PREFERRED_VERSION_gpe-terminal ?= "1.1"
PREFERRED_VERSION_gpe-watch ?= "0.10"
-PREFERRED_VERSION_gpe-what ?= "0.33"
+PREFERRED_VERSION_gpe-what ?= "0.42"
PREFERRED_VERSION_gpe-filemanager ?= "0.23"
PREFERRED_VERSION_gpe-go ?= "0.05"
PREFERRED_VERSION_gpe-irc ?= "0.07"
@@ -84,11 +86,11 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1"
PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}"
PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
PREFERRED_VERSION_linphone ?= "0.12.2"
PREFERRED_VERSION_firefox ?= "1.0"
-PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
+PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1"
PREFERRED_VERSION_poppler ?= "0.3.3"
PREFERRED_VERSION_evince ?= "0.3.2"
-PREFERRED_VERSION_gpe_mini_browser ?= "0.17"
+PREFERRED_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 007750a39..271a6ca3e 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 @@
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \
-pcmciautils apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib"
-
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
ppp 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
# Wireless Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
kernel-module-hermes kernel-module-orinoco \
- kernel-module-orinoco-cs kernel-module-spectrum-cs"
+ kernel-module-orinoco-cs kernel-module-spectrum-cs \
+ hostap-conf orinoco-conf"
# Sound Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \
- kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
+ kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
BOOTSTRAP_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 0ac6b1460..000000000
--- a/openembedded/packages/base-files/base-files/openslug/fstab
+++ /dev/null
@@ -1,5 +0,0 @@
-rootfs / jffs2 defaults 1 1
-proc /proc proc defaults 0 0
-tmpfs /var tmpfs defaults 0 0
-tmpfs /media/ram tmpfs defaults 0 0
-usbfs /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 886b065b5..fb37e07ae 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
# SD/MMC in kernel 2.4
/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
-/dev/mmcblk0p1 /media/card auto defaults,sync,auto 0 0
+/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 d23c43046..0689cfa0f 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 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r45"
+PR = "r47"
LICENSE = "GPL"
SRC_URI = " \
@@ -46,7 +46,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
${sysconfdir}/default"
hostname = "openembedded"
-hostname_openslug = "openslug"
+hostname_slugos = "nslu2"
hostname_mnci = "MNCI"
PACKAGE_ARCH_mnci = "mnci"
hostname_rt3000 = "MNRT"
@@ -121,7 +121,7 @@ do_install_append_nylon() {
ln -sf /var/tmp ${D}/tmp
}
-do_install_append_openslug() {
+do_install_append_slugos() {
printf "" "" >${D}${sysconfdir}/resolv.conf
rm -r ${D}/mnt/*
rmdir ${D}/home/root
@@ -146,5 +146,5 @@ FILES_${PN}-unslung = ""
CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
-CONFFILES_${PN}_openslug = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
+CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
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 05c2e419f..000000000
--- a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/README
+++ /dev/null
@@ -1,13 +0,0 @@
-This patch overrides the root-home.patch for DISTRO=openslug
-
-The patch sets a root password on /etc/passwd, this password is
-
-opeNSLUg
-
-This allows ssh (dropbear) login to an OpenSlug NSLU2 using that
-password.
-
-The password is NO MORE SECURE than the previous empty string,
-however, because ssh logins can now succeed the NSLU2 is LESS
-secure! This password must be changed as soon as possible after
-initial 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 97dab68f3..000000000
--- a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200
-+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200
-@@ -1,4 +1,4 @@
--root::0:0:root:/root:/bin/sh
-+root:Xm./49bYkrkuo:0:0:root:/root:/bin/sh
- daemon:*:1:1:daemon:/usr/sbin:/bin/sh
- bin:*:2:2:bin:/bin:/bin/sh
- 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 7debaeced..000000000
--- a/openembedded/packages/busybox/busybox-1.00/openslug/defconfig
+++ /dev/null
@@ -1,461 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# General Configuration
-#
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_FEATURE_DEVFS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_SUID is not set
-# CONFIG_SELINUX is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-CONFIG_LFS=y
-# USING_CROSS_COMPILER is not set
-EXTRA_CFLAGS_OPTIONS=""
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-PREFIX="./_install"
-
-#
-# Archival Utilities
-#
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-CONFIG_GUNZIP=y
-# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
-CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-# CONFIG_CMP is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-
-#
-# date (forced enabled for use with watch)
-#
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-CONFIG_DD=y
-CONFIG_DF=y
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_EXPR=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
-# CONFIG_HOSTID is not set
-CONFIG_ID=y
-# CONFIG_INSTALL is not set
-# CONFIG_LENGTH is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_OD=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_SEQ=y
-# CONFIG_SHA1SUM is not set
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-CONFIG_SORT=y
-CONFIG_STTY=y
-CONFIG_SYNC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TEST=y
-
-#
-# test (forced enabled for use with shell)
-#
-# CONFIG_FEATURE_TEST_64 is not set
-CONFIG_TOUCH=y
-CONFIG_TR=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WATCH=y
-CONFIG_WC=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls and more
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_GETKEY=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-# CONFIG_SETKEYCODES is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_RUN_PARTS=y
-CONFIG_START_STOP_DAEMON=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-# CONFIG_PATCH is not set
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-# CONFIG_FEATURE_VI_DOT_CMD is not set
-# CONFIG_FEATURE_VI_READONLY is not set
-# CONFIG_FEATURE_VI_SETOPTS is not set
-# CONFIG_FEATURE_VI_SET is not set
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# Finding Utilities
-#
-# CONFIG_FIND is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-# CONFIG_XARGS is not set
-
-#
-# Init Utilities
-#
-# CONFIG_INIT is not set
-# CONFIG_HALT is not set
-# CONFIG_POWEROFF is not set
-# CONFIG_REBOOT is not set
-# CONFIG_MESG is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_ADDGROUP is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_DELUSER is not set
-# CONFIG_GETTY is not set
-CONFIG_FEATURE_U_W_TMP=y
-# CONFIG_LOGIN is not set
-# CONFIG_PASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_CROND is not set
-# CONFIG_CRONTAB is not set
-CONFIG_DC=y
-# CONFIG_DEVFSD is not set
-# CONFIG_LAST is not set
-# CONFIG_HDPARM is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_MT is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-CONFIG_TIME=y
-# CONFIG_WATCHDOG is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_INSMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_RMMOD is not set
-
-#
-# Networking Utilities
-#
-CONFIG_FEATURE_IPV6=y
-# CONFIG_ARPING is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-CONFIG_IFUPDOWN=y
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-CONFIG_FEATURE_IFUPDOWN_IPV6=y
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_INETD is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-# CONFIG_IPCALC is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-CONFIG_NETSTAT=y
-CONFIG_NSLOOKUP=y
-CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING6=y
-CONFIG_ROUTE=y
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
-CONFIG_TFTP=y
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_IP6_LITERAL=y
-
-#
-# udhcp Server/Client
-#
-# CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
-CONFIG_FEATURE_UDHCP_SYSLOG=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_PIDOF=y
-CONFIG_PS=y
-CONFIG_RENICE=y
-CONFIG_TOP=y
-FEATURE_CPU_USAGE_PERCENTAGE=y
-CONFIG_UPTIME=y
-# CONFIG_SYSCTL is not set
-
-#
-# Another Bourne-like Shell
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_PIPE_OPTIMIZATION=y
-CONFIG_FEATURE_BUILTIN_TEST=y
-CONFIG_FEATURE_BUILTIN_ECHO=y
-CONFIG_FEATURE_BUILTIN_PIDOF=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-# CONFIG_ASH_MATH_SUPPORT_64 is not set
-CONFIG_ASH_GETOPTS=y
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-CONFIG_FEATURE_COMMAND_HISTORY=63
-# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_SH_FANCY_PROMPT=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
-CONFIG_LOGREAD=y
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
-FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_GETOPT is not set
-CONFIG_HEXDUMP=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-CONFIG_LOSETUP=y
-CONFIG_MKSWAP=y
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_PIVOT_ROOT=y
-# CONFIG_RDATE is not set
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
-CONFIG_NFSMOUNT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_MOUNT_FORCE=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Debugging Options
-#
-# 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 010f64a53..000000000
--- a/openembedded/packages/busybox/busybox-1.00/openslug/udhcpscript.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script 2004-10-13 00:18:05.000000000 -0700
-+++ busybox-1.00/examples/udhcp/simple.script 2005-06-05 15:08:28.432605118 -0700
-@@ -1,40 +1,101 @@
- #!/bin/sh
-+# openslug UDHCP client script
-+# this must set the HW address (MAC) on the interface
-+#
-+. /etc/default/functions
-
--# udhcpc script edited by Tim Riker <Tim@Rikers.org>
-
--[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
-+echodns(){
-+ local dns
-+ if test $# -gt 0
-+ then
-+ for dns in "$@"
-+ do
-+ echo "nameserver $dns"
-+ done
-+ fi
-+}
-+
-+# Output the correct contents for resolv.conf
-+mkresolv() {
-+ test -n "$domain" && echo "search $domain"
-+ echodns $dns
-+}
-+
-+# checksum of a file (or stdin if -)
-+md5strm() {
-+ md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p'
-+}
-+
-+bind() {
-+ local B N metric i olddomain
-+ B=
-+ test -n "$broadcast" && B="broadcast $broadcast"
-+ N=
-+ test -n "$subnet" && N="netmask $subnet"
-+ ifconfig "$interface" "$ip" $B $N up
-+
-+ # If given router information delete the old information and
-+ # enter new stuff, routers get metrics incremented by 1
-+ # between each (this is somewhat arbitrary)
-+ if test -n "$router"
-+ then
-+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null
-+ do
-+ :
-+ done
-
--RESOLV_CONF="/etc/resolv.conf"
--[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
--[ -n "$subnet" ] && NETMASK="netmask $subnet"
-+ metric=0
-+ for i in $router
-+ do
-+ route add default gw "$i" dev "$interface" metric $((metric++))
-+ done
-+ fi
-+
-+ olddomain=
-+ test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)"
-+ if test -n "$domain" -a "$domain" != "$olddomain"
-+ then
-+ echo "$domain" >/etc/defaultdomain
-+ # and update the kernel view too
-+ echo "$domain" >/proc/sys/kernel/domainname
-+ fi
-+
-+ # Update /etc/resolv.conf to reflect domain and dns information,
-+ # this always clears resolv.conf if none is given
-+ md5old="$(md5strm /etc/resolv.conf)"
-+ md5new="$(mkresolv | md5strm -)"
-+ test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf
-+}
-
- case "$1" in
-- deconfig)
-- /sbin/ifconfig $interface 0.0.0.0
-- ;;
--
-- renew|bound)
-- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
--
-- if [ -n "$router" ] ; then
-- echo "deleting routers"
-- while route del default gw 0.0.0.0 dev $interface ; do
-- :
-- done
--
-- metric=0
-- for i in $router ; do
-- route add default gw $i dev $interface metric $((metric++))
-- done
-+deconfig)
-+ # Bring the interface up (without inet at this point)
-+ ifconfig "$interface" up;;
-+
-+renew|bound)
-+ bind;;
-+
-+leasefail)
-+ # Pull the values from the config data if (only only if) this
-+ # is the config interface
-+ if test "$interface" = "$(config iface)"
-+ then
-+ ip="$(config ip)"
-+ if test -n "$ip"
-+ then
-+ router="$(config gateway)"
-+ subnet="$(config netmask)"
-+ broadcast="$(config broadcast)"
-+ domain="$(config domain)"
-+ dns="$(config dns)"
-+
-+ bind
- fi
-+ fi;;
-
-- echo -n > $RESOLV_CONF
-- [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
-- for i in $dns ; do
-- echo adding dns $i
-- echo nameserver $i >> $RESOLV_CONF
-- done
-- ;;
-+*) echo "udhcpc: $*: unknown command" >&2
-+ exit 1;;
- esac
-
- 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 000000000..aefb99406
--- /dev/null
+++ b/openembedded/packages/busybox/busybox-1.00/uclibc_posix.patch
@@ -0,0 +1,20 @@
+see http://www.busybox.net/lists/busybox/2004-December/013276.html
+
+--- busybox-old/libbb/loop.c 2004-08-16 04:36:28.000000000 -0400
++++ busybox/libbb/loop.c 2004-12-04 23:45:58.000000000 -0500
+@@ -19,6 +19,7 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#include <asm/posix_types.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -30,7 +31,6 @@
+ /* Grumble... The 2.6.x kernel breaks asm/posix_types.h
+ * so we get to try and cope as best we can... */
+ #include <linux/version.h>
+-#include <asm/posix_types.h>
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ #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 988265d72..5b770669c 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"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r30"
+PR = "r32"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://add-getkey-applet.patch;patch=1 \
@@ -28,6 +28,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://dhcp-hostname.patch;patch=1 \
file://gzip-spurious-const.patch;patch=1 \
file://ifupdown-spurious-environ.patch;patch=1 \
+ file://uclibc_posix.patch;patch=1 \
file://defconfig \
file://busybox-cron \
file://busybox-httpd \
@@ -56,8 +57,8 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
INITSCRIPT_NAME_${PN} = "syslog"
CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
-# This disables the syslog startup links in openslug (see openslug-init)
-INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
+# This disables the syslog startup links in slugos (see slugos-init)
+INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
inherit cml1 update-rc.d
diff --git a/openembedded/packages/cairo/cairo_1.0.0.bb b/openembedded/packages/cairo/cairo_1.0.0.bb
index aa97a9f4d..84cb58117 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"
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/coreutils/coreutils-native_5.1.3.bb b/openembedded/packages/coreutils/coreutils-native_5.1.3.bb
index 3fbe1bb6f..74b39541f 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 @@
SECTION = "base"
-inherit native
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
S = "${WORKDIR}/coreutils-${PV}"
include coreutils_${PV}.bb
+inherit 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 000000000..bc4c461fe
--- /dev/null
+++ b/openembedded/packages/dropbear/dropbear/chansession-security-fix.patch
@@ -0,0 +1,74 @@
+Date: Sun, 11 Dec 2005 23:30:02 +0800
+From: Matt Johnston <matt@ucc.asn.au>
+To: dropbear@ucc.gu.uwa.edu.au
+Subject: Dropbear 0.47 (and security fix)
+Message-ID: <20051211153002.GH28839@ucc.gu.uwa.edu.au>
+
+Hi all.
+
+I've put up a new release 0.47 of Dropbear, which has
+various fixes and new features - see the change summary
+below.
+http://matt.ucc.asn.au/dropbear/dropbear.html is the
+url as usual or directly at
+http://matt.ucc.asn.au/dropbear/dropbear-0.47.tar.bz2
+
+This release also fixes a potential security issue, which
+may allow authenticated users to run arbitrary code as the
+server user. I'm unsure exactly how likely it is to be
+exploitable, but anyone who's running a multi-user server is
+advised to upgrade. For older releases, the patch is:
+(against chanesssion.c for 0.43 and earlier).
+
+--- dropbear/svr-chansession.c
++++ dropbear/svr-chansession.c
+@@ -810,7 +810,7 @@
+ /* need to increase size */
+ if (i == svr_ses.childpidsize) {
+ svr_ses.childpids = (struct ChildPid*)m_realloc(svr_ses.childpids,
+- sizeof(struct ChildPid) * svr_ses.childpidsize+1);
++ sizeof(struct ChildPid) * (svr_ses.childpidsize+1));
+ svr_ses.childpidsize++;
+ }
+
+
+Matt
+
+
+0.47 - Thurs Dec 8 2005
+
+- SECURITY: fix for buffer allocation error in server code, could potentially
+ allow authenticated users to gain elevated privileges. All multi-user systems
+ running the server should upgrade (or apply the patch available on the
+ Dropbear webpage).
+
+- Fix channel handling code so that redirecting to /dev/null doesn't use
+ 100% CPU.
+
+- Turn on zlib compression for dbclient.
+
+- Set "low delay" TOS bit, can significantly improve interactivity
+ over some links.
+
+- Added client keyboard-interactive mode support, allows operation with
+ newer OpenSSH servers in default config.
+
+- Log when pubkey auth fails because of bad ~/.ssh/authorized_keys permissions
+
+- Improve logging of assertions
+
+- Added aes-256 cipher and sha1-96 hmac.
+
+- Fix twofish so that it actually works.
+
+- Improve PAM prompt comparison.
+
+- Added -g (dbclient) and -a (dropbear server) options to allow
+ connections to listening forwarded ports from remote machines.
+
+- Various other minor fixes
+
+- Compile fixes for glibc 2.1 (ss_family vs __ss_family) and NetBSD
+ (netinet/in_systm.h needs to be included).
+
+
diff --git a/openembedded/packages/dropbear/dropbear_0.46.bb b/openembedded/packages/dropbear/dropbear_0.46.bb
index 80373e3a1..5bce95a71 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"
SECTION = "console/network"
LICENSE = "MIT"
DEPENDS = "zlib"
-PR = "r3"
PROVIDES = "ssh sshd"
+PR = "r4"
SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
file://urandom-xauth-changes-to-options.h.patch;patch=1 \
file://configure.patch;patch=1 \
file://allow-nopw.patch \
file://fix-2kb-keys.patch;patch=1 \
+ file://chansession-security-fix.patch;patch=1 \
file://init"
inherit autotools update-rc.d
diff --git a/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb b/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb
index 199493dc1..e13aac595 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"
HOMEPAGE = "http://e2fsprogs.sourceforge.net"
LICENSE = "GPL"
SECTION = "base"
-PR = "r2"
+PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
file://no-hardlinks.patch;patch=1"
@@ -35,7 +35,15 @@ do_stage () {
done
}
-PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck"
+# blkid used to be part of e2fsprogs but is useful outside, add it
+# as an RDEPENDS so that anything relying on it being in e2fsprogs
+# still works
+RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen"
+
+PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs"
+FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
+FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
+FILES_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 95572ce84..c3bbb8981 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"
DESCRIPTION = "Jim Clarkes XML parser library."
HOMEPAGE = "http://expat.sourceforge.net/"
LICENSE = "MIT"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
file://autotools.patch;patch=1"
diff --git a/openembedded/packages/gcc/gcc-package-cross.inc b/openembedded/packages/gcc/gcc-package-cross.inc
index 56299b515..4b1f8f68e 100644
--- a/openembedded/packages/gcc/gcc-package-cross.inc
+++ b/openembedded/packages/gcc/gcc-package-cross.inc
@@ -72,6 +72,6 @@ do_install () {
if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.*
${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.*
- ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
+ ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.*
fi
}
diff --git a/openembedded/packages/gcc/gcc3-build.inc b/openembedded/packages/gcc/gcc3-build.inc
index a09c6cf1f..b7523c42f 100644
--- a/openembedded/packages/gcc/gcc3-build.inc
+++ b/openembedded/packages/gcc/gcc3-build.inc
@@ -47,7 +47,10 @@ CPPFLAGS = ""
# Used by configure to define additional values for FLAGS_FOR_TARGET -
# passed to all the compilers.
ARCH_FLAGS_FOR_TARGET = ""
-ARCH_FLAGS_FOR_TARGET_nslu2 = "${TARGET_CC_ARCH}"
+#NOTE: not tested on other platforms, the following is probably correct
+# everywhere!
+ARCH_FLAGS_FOR_TARGET_slugos = "${TARGET_CC_ARCH}"
+ARCH_FLAGS_FOR_TARGET_unslung = "${TARGET_CC_ARCH}"
EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
def 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 856809a7b..ba64d2421 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"
LICENSE = "GPL"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-DEFAULT_PREFERENCE_nslu2 = "-1"
-
inherit autotools gettext
include 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 3c99b2885..adfc0459c 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"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
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 650a3079e..7429f4167 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"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
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 6615fc39c..785261e7c 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"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
DEPENDS = "gtk-doc-native"
-PR = "r0"
+PR = "r3"
EXTRA_OECONF = "--disable-debug"
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 000000000..c195aad63
--- /dev/null
+++ b/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
@@ -0,0 +1,16 @@
+--- trunk/backends/xml-backend.c~ 2006-01-18 09:57:39.000000000 -0800
++++ trunk/backends/xml-backend.c 2006-01-19 11:38:37.000000000 -0800
+@@ -115,6 +115,13 @@
+
+ typedef struct _XMLSource XMLSource;
+
++extern GConfLock*
++gconf_get_lock (const gchar *lock_directory,
++ GError **err);
++extern gboolean
++gconf_release_lock (GConfLock *lock,
++ GError **err);
++
+ /* XMLSource **/
+
+ 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 000000000..312a356c8
--- /dev/null
+++ b/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
@@ -0,0 +1,11 @@
+--- trunk/backends/Makefile~ 2006-01-19 09:52:22.000000000 -0800
++++ trunk/backends/Makefile 2006-01-19 13:13:23.000000000 -0800
+@@ -84,7 +84,7 @@
+ xml_test_OBJECTS = $(am_xml_test_OBJECTS)
+ xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
+- $(top_builddir)/backends/libgconfbackend-oldxml.la
++ libgconfbackend-oldxml.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
diff --git a/openembedded/packages/gnome/gconf-dbus_svn.bb b/openembedded/packages/gnome/gconf-dbus_svn.bb
index b71d5179c..d6b79494b 100644
--- a/openembedded/packages/gnome/gconf-dbus_svn.bb
+++ b/openembedded/packages/gnome/gconf-dbus_svn.bb
@@ -12,19 +12,26 @@ PR = "r0"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
file://gconf-dbus-update.patch;patch=1;pnum=0 \
+ file://xml-backend-locks-compile-fix.patch;patch=1 \
+ file://xml-backend-oldxml-Makefile.patch \
file://69gconfd-dbus"
-PARALLEL_MAKE = ""
-
inherit pkgconfig autotools
S = "${WORKDIR}/trunk"
+PARALLEL_MAKE = ""
+
FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
HEADERS = "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"
+do_compile_prepend() {
+ cd ${S}
+ patch -p1 < ../xml-backend-oldxml-Makefile.patch
+}
+
do_stage() {
oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
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 bf98e1441..c71f21c9d 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 @@
LICENSE = "GPL"
-
-inherit pkgconfig autotools
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2"
+inherit gnome
DEPENDS += "shared-mime-info intltool-native"
RDEPENDS = "shared-mime-info"
+
+PR = "r2"
diff --git a/openembedded/packages/gnu-config/gnu-config_20050701.bb b/openembedded/packages/gnu-config/gnu-config_20050701.bb
index 4bc4501ec..2066014ad 100644
--- a/openembedded/packages/gnu-config/gnu-config_20050701.bb
+++ b/openembedded/packages/gnu-config/gnu-config_20050701.bb
@@ -1,15 +1,14 @@
-SECTION = "base"
DESCRIPTION = "gnu-configize"
+SECTION = "base"
LICENSE = "GPL"
DEPENDS = ""
INHIBIT_DEFAULT_DEPS = "1"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
PV = "0.1+cvs${FIXEDSRCDATE}"
PR = "r4"
-SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
+SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
file://config-guess-uclibc.patch;patch=1 \
file://gnu-configize.in"
S = "${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 000000000..6c9cb09e6
--- /dev/null
+++ b/openembedded/packages/hostap/hostap-conf_1.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PACKAGE_ARCH = "all"
+PR = "r0"
+
+SRC_URI = "file://hostap_cs.conf \
+ file://hostap_cs.conf-upstream"
+
+do_install() {
+ install -d ${D}${sysconfdir}/pcmcia
+ install -m 0644 ${WORKDIR}/hostap_cs.conf-upstream ${D}${sysconfdir}/pcmcia/hostap_cs.conf
+ cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
+}
diff --git a/openembedded/packages/hostap/hostap-modules_0.3.9.bb b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
index 0f9d7c07b..940b23863 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"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PROVIDES = "virtual/kernel-hostap"
-PR = "r6"
+PROVIDES = "virtual/kernel-hostap hostap-conf"
+PR = "r8"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://hostap_cs.conf \
@@ -45,3 +45,4 @@ FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNE
FILES_hostap-modules = "/lib/modules/"
RDEPENDS_hostap-modules-cs = "hostap-modules"
RDEPENDS_hostap-modules-pci = "hostap-modules"
+RPROVIDES_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 dcf174b93..cdfb0c1e3 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"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
RDEPENDS = "virtual/kernel-hostap"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
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 cdfb0c1e3..98254602a 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"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-RDEPENDS = "virtual/kernel-hostap"
-PR = "r2"
+DEPENDS = "virtual/kernel-hostap"
+RRECOMMENDS = "virtual/kernel-hostap"
+PR = "r3"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
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 2f0f9a2cc..7722bc4ae 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}"
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
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 dc45e948d..e6339979e 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 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
keycode 1 = +a +A +a Control_a Control_a
keycode 2 = +b +B underscore Control_b Control_b
keycode 3 = +c +C +c Control_c Control_c
@@ -33,17 +33,17 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 34 = Escape Escape Escape Escape Escape
-keycode 35 = Left Left Home Left Left
+keycode 35 = Left Left Left Left Left Decr_Console
keycode 36 = Up Up PageUp Up Up
keycode 37 = Down Down PageDown Down Down
-keycode 38 = Right Right End Right Right
+keycode 38 = Right Right Right Right Right Incr_Console
keycode 39 = Return Return Return Return Return
keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol
-keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol
-keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol
-keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol
-keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol
+keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
+keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
+keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
+keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
+keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
@@ -57,7 +57,7 @@ keycode 55 = at grave VoidSymbol VoidSymbol
keycode 56 = Control Control Control Control Control
keycode 57 = Alt Alt Alt Alt Alt
keycode 58 = Control Control Control Control Control
-keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol
+keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
@@ -67,7 +67,7 @@ keycode 65 = Tab Tab Caps_Lock Tab
keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol
+keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
keycode 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 dc45e948d..e6339979e 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 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
keycode 1 = +a +A +a Control_a Control_a
keycode 2 = +b +B underscore Control_b Control_b
keycode 3 = +c +C +c Control_c Control_c
@@ -33,17 +33,17 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 34 = Escape Escape Escape Escape Escape
-keycode 35 = Left Left Home Left Left
+keycode 35 = Left Left Left Left Left Decr_Console
keycode 36 = Up Up PageUp Up Up
keycode 37 = Down Down PageDown Down Down
-keycode 38 = Right Right End Right Right
+keycode 38 = Right Right Right Right Right Incr_Console
keycode 39 = Return Return Return Return Return
keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol
-keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol
-keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol
-keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol
-keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol
+keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
+keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
+keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
+keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
+keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
@@ -57,7 +57,7 @@ keycode 55 = at grave VoidSymbol VoidSymbol
keycode 56 = Control Control Control Control Control
keycode 57 = Alt Alt Alt Alt Alt
keycode 58 = Control Control Control Control Control
-keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol
+keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
@@ -67,7 +67,7 @@ keycode 65 = Tab Tab Caps_Lock Tab
keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol
+keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
keycode 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 792a31d6d..6ebc63426 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`
if [ -e /etc/keymap-$KERNEL_MAJMIN.map ]; then
loadkeys /etc/keymap-$KERNEL_MAJMIN.map
fi
+
+if ( ls "/etc" | grep -q "keymap-extension-${KERNEL_MAJMIN}" )
+then
+ for extension in `ls -1 /etc/keymap-extension-$KERNEL_MAJMIN*`
+ do
+ loadkeys "$extension"
+ done
+fi
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 dc45e948d..e6339979e 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 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
keycode 1 = +a +A +a Control_a Control_a
keycode 2 = +b +B underscore Control_b Control_b
keycode 3 = +c +C +c Control_c Control_c
@@ -33,17 +33,17 @@ keycode 31 = BackSpace BackSpace Delete BackSpace
keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock
keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 34 = Escape Escape Escape Escape Escape
-keycode 35 = Left Left Home Left Left
+keycode 35 = Left Left Left Left Left Decr_Console
keycode 36 = Up Up PageUp Up Up
keycode 37 = Down Down PageDown Down Down
-keycode 38 = Right Right End Right Right
+keycode 38 = Right Right Right Right Right Incr_Console
keycode 39 = Return Return Return Return Return
keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol
-keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol
-keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol
-keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol
-keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol
+keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol Console_1
+keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol Console_2
+keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol Console_3
+keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol Console_4
+keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol Console_5
keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol
keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol
keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol
@@ -57,7 +57,7 @@ keycode 55 = at grave VoidSymbol VoidSymbol
keycode 56 = Control Control Control Control Control
keycode 57 = Alt Alt Alt Alt Alt
keycode 58 = Control Control Control Control Control
-keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol
+keycode 59 = minus VoidSymbol at VoidSymbol VoidSymbol
keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock
keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
@@ -67,7 +67,7 @@ keycode 65 = Tab Tab Caps_Lock Tab
keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
-keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol
+keycode 69 = Alt VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol
keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1
keycode 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 5f42a3db5..b27f21e32 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
keycode 92 = space
control keycode 92 = nul
keycode 93 =
-keycode 94 = AltGr
+keycode 94 = exclam
keycode 95 = semicolon
keycode 96 = colon
keycode 97 = bracketright
@@ -119,7 +119,7 @@ keycode 112 = Shift
keycode 113 =
keycode 114 =
keycode 115 =
-keycode 116 =
+keycode 116 = underscore
keycode 117 = Control
keycode 118 =
keycode 119 =
diff --git a/openembedded/packages/initscripts/initscripts_1.0.bb b/openembedded/packages/initscripts/initscripts_1.0.bb
index c5332f23c..4e11097f8 100644
--- a/openembedded/packages/initscripts/initscripts_1.0.bb
+++ b/openembedded/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r59"
+PR = "r67"
SRC_URI = "file://halt \
file://ramdisk \
@@ -128,12 +128,14 @@ do_install () {
# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom
ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs
+ # udev will run at S55 if installed
ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk
ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot
ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs
# ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom
ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs
+ # udev will run at S55 if installed
ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt
ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner
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 2506dbab6..7b6675161 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
PR = "r4"
inherit native
DEPENDS = ""
+RDEPENDS = ""
do_stage() {
for i in ${INSTALL}; do
diff --git a/openembedded/packages/jpeg/jpeg_6b.bb b/openembedded/packages/jpeg/jpeg_6b.bb
index 49e0382b6..23e3ed82b 100644
--- a/openembedded/packages/jpeg/jpeg_6b.bb
+++ b/openembedded/packages/jpeg/jpeg_6b.bb
@@ -1,3 +1,4 @@
+PR = "r2"
SECTION = "libs"
PRIORITY = "required"
MAINTAINER = "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 d948ff50d..25744c7dc 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"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DIR}/man
+ autotools_stage_all
}
diff --git a/openembedded/packages/libxfixes/libxfixes_2.0.1.bb b/openembedded/packages/libxfixes/libxfixes_2.0.1.bb
index b6560b8e8..29e23e379 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}"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/libxfixes/libxfixes_cvs.bb b/openembedded/packages/libxfixes/libxfixes_cvs.bb
index a18ceeb0c..6a9ae6194 100644
--- a/openembedded/packages/libxfixes/libxfixes_cvs.bb
+++ b/openembedded/packages/libxfixes/libxfixes_cvs.bb
@@ -10,9 +10,5 @@ S = "${WORKDIR}/Xfixes"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/libxft/libxft_2.1.6.bb b/openembedded/packages/libxft/libxft_2.1.6.bb
index d7cb351d6..12c8bdfb6 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 \
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
+ autotools_stage_all
}
python do_package() {
diff --git a/openembedded/packages/libxft/libxft_cvs.bb b/openembedded/packages/libxft/libxft_cvs.bb
index 3827318cd..6d5c11f36 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 \
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
+ autotools_stage_all
}
python do_package() {
diff --git a/openembedded/packages/libxi/libxi_6.0.1.bb b/openembedded/packages/libxi/libxi_6.0.1.bb
index b84aef819..05ad22989 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}"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/libxrandr/libxrandr_1.0.2.bb b/openembedded/packages/libxrandr/libxrandr_1.0.2.bb
index 8d646539c..ff32e0aa3 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}"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/libxrender/libxrender_cvs.bb b/openembedded/packages/libxrender/libxrender_cvs.bb
index ca6f16f1b..c4d26b5c2 100644
--- a/openembedded/packages/libxrender/libxrender_cvs.bb
+++ b/openembedded/packages/libxrender/libxrender_cvs.bb
@@ -11,9 +11,5 @@ S = "${WORKDIR}/Xrender"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.15.bb b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
index 3e75c8f9a..3eae7cbc8 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 @@
include linux-openzaurus.inc
-PR = "r3"
+PR = "r5"
# Handy URLs
# 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 \
${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \
${RPSRC}/pxa2xx_release-r1.patch;patch=1 \
${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \
+ ${RPSRC}/arm_checksum_memory-r0.patch;patch=1 \
+ ${RPSRC}/pxa_clocks-r0.patch;patch=1 \
${RPSRC}/ide_not_removable-r0.patch;patch=1 \
${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \
${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \
- ${RPSRC}/led_core-r11.patch;patch=1 \
- ${RPSRC}/led_triggers-r9.patch;patch=1 \
- ${RPSRC}/led_trig_timer-r4.patch;patch=1 \
+ ${RPSRC}/led_core-r12.patch;patch=1 \
+ ${RPSRC}/led_triggers-r10.patch;patch=1 \
+ ${RPSRC}/led_trig_timer-r5.patch;patch=1 \
${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 \
- ${RPSRC}/led_zaurus-r8.patch;patch=1 \
- ${RPSRC}/led_locomo-r5.patch;patch=1 \
- ${RPSRC}/led_ixp4xx-r0.patch;patch=1 \
- ${RPSRC}/led_tosa-r2.patch;patch=1 \
- ${RPSRC}/led_ide-r2.patch;patch=1 \
+ ${RPSRC}/led_zaurus-r9.patch;patch=1 \
+ ${RPSRC}/led_locomo-r6.patch;patch=1 \
+ ${RPSRC}/led_ixp4xx-r1.patch;patch=1 \
+ ${RPSRC}/led_tosa-r3.patch;patch=1 \
+ ${RPSRC}/led_ide-r3.patch;patch=1 \
${RPSRC}/led_nand-r2.patch;patch=1 \
+ ${RPSRC}/ide_end_request-r0.patch;patch=1 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
- ${RPSRC}/pxa_rtc-r3.patch;patch=1 \
+ ${RPSRC}/rtc_class-r0.patch;patch=1 \
+ ${RPSRC}/rtc_class_pxa-r0.patch;patch=1 \
${RPSRC}/input_power-r4.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
${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 \
${RPSRC}/zaurus_keyboard_tweak-r0.patch;patch=1 \
${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \
${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \
- ${RPSRC}/arm_checksum_memory-r0.patch;patch=1 \
${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \
- ${RPSRC}/pxa_clocks-r0.patch;patch=1 \
${RPSRC}/pm_changes-r0.patch;patch=1 \
- ${RPSRC}/sharpsl_pm-do-r1.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
+ ${DOSRC}/kexec-arm-r0.patch \
file://add-oz-release-string.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1 \
${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 2c7104322..185ea7a3a 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 @@
diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
---- module-init-tools-3.1-pre6.orig/modprobe.8 2004-10-06 02:44:43.000000000 +0200
-+++ module-init-tools-3.1-pre6/modprobe.8 2004-10-09 01:39:01.000000000 +0200
-@@ -30,6 +30,7 @@
- the modules and other files, except for the optional
- \fI/etc/modprobe.conf\fR configuration file
+--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200
++++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200
+@@ -31,6 +31,7 @@
+ \fI/etc/modprobe.conf\fR configuration file and
+ \fI/etc/modprobe.d\fR directory
(see \fBmodprobe.conf\fR(5)).
+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
.PP
Note that this version of \fBmodprobe\fR does not
do anything to the module itself: the work of resolving symbols
-diff -ruN module-init-tools-3.1-pre6.orig/modprobe.c module-init-tools-3.1-pre6/modprobe.c
---- module-init-tools-3.1-pre6.orig/modprobe.c 2004-10-09 01:40:18.000000000 +0200
-+++ module-init-tools-3.1-pre6/modprobe.c 2004-10-09 01:40:11.000000000 +0200
-@@ -1082,6 +1082,10 @@
- {
+--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200
++++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200
+@@ -1158,6 +1158,10 @@
DIR *dir;
+ int ret = 0;
+ /* ignore everything in this directory */
+ if (streq(filename, "/etc/modprobe.d/arch"))
+ return 1;
+
- /* If it's a directory, recurse. */
+ /* Reiser4 has file/directory duality: treat it as both. */
dir = opendir(filename);
if (dir) {
diff --git a/openembedded/packages/module-init-tools/files/manpagesopt b/openembedded/packages/module-init-tools/files/manpagesopt
index 2e9d228d5..5d5cac609 100644
--- a/openembedded/packages/module-init-tools/files/manpagesopt
+++ b/openembedded/packages/module-init-tools/files/manpagesopt
@@ -1,7 +1,7 @@
-Index: module-init-tools-3.1/configure.in
+Index: module-init-tools-3.2-pre9/configure.in
===================================================================
---- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500
-+++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500
+--- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000
++++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000
@@ -41,5 +41,14 @@
fi])
AC_SUBST(MODULE_DIR)
@@ -18,22 +18,24 @@ Index: module-init-tools-3.1/configure.in
+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
+AC_OUTPUT([Makefile])
-Index: module-init-tools-3.1/Makefile.am
+Index: module-init-tools-3.2-pre9/Makefile.am
===================================================================
---- module-init-tools-3.1.orig/Makefile.am 2004-07-12 02:11:46.000000000 -0400
-+++ module-init-tools-3.1/Makefile.am 2005-01-20 02:24:32.155277224 -0500
-@@ -21,11 +21,12 @@
+--- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000
++++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000
+@@ -21,13 +21,14 @@
MAN5 = modprobe.conf.5 modules.dep.5
MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
-man_MANS = $(MAN5) $(MAN8)
- mandir = $(shell if [ `echo $(prefix)/ | tr -s /` = / ]; then echo /usr/share/man; else echo $(prefix)/man; fi)
+ # If they haven't overridden mandir, fix it (never /man!)
+ mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
+ TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions
+
+-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
+if MANPAGES
+man_MANS = $(MAN5) $(MAN8)
+endif
--EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ stress_modules.sh install-with-care $(SGML) $(man_MANS)
-
sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
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 185ea7a3a..000000000
--- a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
---- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200
-+++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200
-@@ -31,6 +31,7 @@
- \fI/etc/modprobe.conf\fR configuration file and
- \fI/etc/modprobe.d\fR directory
- (see \fBmodprobe.conf\fR(5)).
-+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
- .PP
- Note that this version of \fBmodprobe\fR does not
- do anything to the module itself: the work of resolving symbols
---- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200
-+++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200
-@@ -1158,6 +1158,10 @@
- DIR *dir;
- int ret = 0;
-
-+ /* ignore everything in this directory */
-+ if (streq(filename, "/etc/modprobe.d/arch"))
-+ return 1;
-+
- /* Reiser4 has file/directory duality: treat it as both. */
- dir = opendir(filename);
- 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 5d5cac609..000000000
--- a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: module-init-tools-3.2-pre9/configure.in
-===================================================================
---- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000
-+++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000
-@@ -41,5 +41,14 @@
- fi])
- AC_SUBST(MODULE_DIR)
-
--AC_OUTPUT([Makefile])
-+AC_ARG_ENABLE(manpages,
-+[ --disable-manpages Disable man page generation.],
-+[if test x"$enableval" != x"no"; then
-+ enable_manpages=yes
-+else
-+ enable_manpages=no
-+fi],
-+[enable_manpages=yes])
-+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
-
-+AC_OUTPUT([Makefile])
-Index: module-init-tools-3.2-pre9/Makefile.am
-===================================================================
---- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000
-+++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000
-@@ -21,13 +21,14 @@
- MAN5 = modprobe.conf.5 modules.dep.5
- MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
- SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
--man_MANS = $(MAN5) $(MAN8)
- # If they haven't overridden mandir, fix it (never /man!)
- mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
-
- TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions
-
--EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
-+if MANPAGES
-+man_MANS = $(MAN5) $(MAN8)
-+endif
-
- sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
- 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 56fec5607..000000000
--- a/openembedded/packages/module-init-tools/module-init-tools-cross_3.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-LICENSE = "GPL"
-include module-init-tools_${PV}.bb
-inherit cross
-DEFAULT_PREFERENCE = "0"
-PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
-
-PR="r3"
-
-# When cross compiling depmod as shipped cannot handle endian
-# differences between host and target, this fixes the problem.
-# It also solves any possible issues with alignment (only likely
-# if cross compiling for a low alignment target - e.g. x86, on
-# a high alignment host - e.g. SPARC).
-SRC_URI += " file://depmod-byteswap.patch;patch=1 "
-
-EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
-
-do_stage () {
- oe_runmake install
-}
-
-do_install () {
- :
-}
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 000000000..4bcc31170
--- /dev/null
+++ b/openembedded/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+include module-init-tools_${PV}.bb
+inherit cross
+DEFAULT_PREFERENCE = "0"
+PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
+
+EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
+
+do_stage () {
+ oe_runmake install
+}
+
+do_install () {
+ :
+}
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 62523f513..000000000
--- a/openembedded/packages/module-init-tools/module-init-tools_3.1.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-LICENSE = "GPL"
-SECTION = "base"
-DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
-removing kernel modules for Linux (versions 2.5.48 and above). It serves \
-the same function that the modutils package serves for Linux 2.4."
-PR = "r2"
-
-PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
-RDEPENDS_${PN} += "module-init-tools-depmod"
-
-FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
-FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
-
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
- file://ignore_arch_directory;patch=1 \
- file://modutils_extension;patch=1 \
- file://no_man_rebuild;patch=1 \
- file://manpagesopt;patch=1 \
- file://soc.patch;patch=1;pnum=0"
-S = "${WORKDIR}/module-init-tools-${PV}"
-
-EXTRA_OECONF = "--disable-manpages"
-
-bindir = "/bin"
-sbindir = "/sbin"
-
-inherit autotools
-
-do_install() {
- autotools_do_install
- for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
- mv ${D}/$f ${D}/$f.26
- done
-}
-
-pkg_postinst_module-init-tools() {
-#!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
-bn=`basename $f`
- update-alternatives --install /$f $bn /$f.26 20
-done
-}
-
-pkg_prerm_module-init-tools() {
-#!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
-bn=`basename $f`
- update-alternatives --remove $bn /$f.26
-done
-}
-
-pkg_postinst_module-init-tools-depmod() {
-#!/bin/sh
-update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
-}
-
-pkg_prerm_module-init-tools() {
-#!/bin/sh
-update-alternatives --remove depmod /sbin/depmod.26
-}
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 bbd8cca1b..bbd8cca1b 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 d10f55f58..197fed95f 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>"
DEPENDS = "gmp flex-native"
RRECOMMENDS = "kernel-module-ipsec"
RDEPENDS_nylon = "perl"
-PR = "r5"
+PR = "r4"
-SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
+SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
file://openswan-2.2.0-gentoo.patch;patch=1 \
file://gcc4-fixes.patch;patch=1 \
file://makefile-whitespace-fix.patch;patch=1 \
diff --git a/openembedded/packages/orinoco/spectrum-fw.bb b/openembedded/packages/orinoco/spectrum-fw.bb
index 1d388332a..dd76000ed 100644
--- a/openembedded/packages/orinoco/spectrum-fw.bb
+++ b/openembedded/packages/orinoco/spectrum-fw.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
LICENSE = "unknown"
PR = "r0"
+PACKAGE_ARCH = "all"
SRC_URI = "file://get_symbol_fw \
file://parse_symbol_fw"
diff --git a/openembedded/packages/pcmcia-cs/files/arm/pcmcia b/openembedded/packages/pcmcia-cs/files/arm/pcmcia
index 05b381a5f..d5346fb13 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
case "`uname -r`" in
2.4*)
PCIC=pxa_cs
- DS=ds
;;
2.6*)
PCIC=pxa2xx_core
- DS=pcmcia
;;
esac
;;
@@ -26,6 +24,15 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
;;
esac
+case "`uname -r`" in
+ 2.4*)
+ DS=ds
+ ;;
+ 2.6*)
+ DS=pcmcia
+ ;;
+esac
+
case `module_id` in
"HP iPAQ H3"* | "HP iPAQ H5"*)
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 e0ebf70d9..1db3006e1 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"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "virtual/kernel"
-PR = "r23"
+PR = "r27"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
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 e78a4829a..a960439ad 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"
include perl-rdepends_${PV}.inc
# To create/update the perl-rdepends_${PV}.inc use this piece of ugly script (modified for your arch/paths etc):
-# 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
+# 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
# Some packages changed names in 5.8.7-r14, RPROVIDE them
RPROVIDES_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 41af18ed5..6984dbdb1 100644
--- a/openembedded/packages/popt/popt_1.7.bb
+++ b/openembedded/packages/popt/popt_1.7.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
DESCRIPTION = "The popt library exists essentially \
for parsing command line options."
LICENSE = "MIT"
-PR = "r1"
+PR = "r3"
SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
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 000000000..574abfaf2
--- /dev/null
+++ b/openembedded/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch
@@ -0,0 +1,19 @@
+--- ppp-2.4.3/pppd/Makefile.linux.orig 2006-01-17 15:09:56.000000000 +0000
++++ ppp-2.4.3/pppd/Makefile.linux 2006-01-17 15:10:21.000000000 +0000
+@@ -117,12 +117,12 @@
+ #LIBS += -lshadow $(LIBS)
+ endif
+
+-ifneq ($(wildcard /usr/include/crypt.h),)
++#ifneq ($(wildcard /usr/include/crypt.h),)
+ CFLAGS += -DHAVE_CRYPT_H=1
+-endif
+-ifneq ($(wildcard /usr/lib/libcrypt.*),)
++#endif
++#ifneq ($(wildcard /usr/lib/libcrypt.*),)
+ LIBS += -lcrypt
+-endif
++#endif
+
+ ifdef NEEDDES
+ ifndef USE_CRYPT
diff --git a/openembedded/packages/ppp/ppp_2.4.3.bb b/openembedded/packages/ppp/ppp_2.4.3.bb
index 8701efc55..b8253a1a5 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"
HOMEPAGE = "http://samba.org/ppp/"
DEPENDS = "libpcap"
LICENSE = "BSD GPLv2"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
file://makefile.patch;patch=1 \
@@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
file://plugins-fix-CC.patch;patch=1 \
file://pppoatm-makefile.patch;patch=1 \
file://enable-ipv6.patch;patch=1 \
+ file://makefile-remove-hard-usr-reference.patch;patch=1 \
file://pon \
file://poff \
file://init \
@@ -24,7 +25,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
inherit autotools
EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
-EXTRA_OECONF = --disable-strip
+EXTRA_OECONF = "--disable-strip"
do_install_append () {
make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
@@ -60,7 +61,7 @@ DESCRIPTION_ppp-password = "Plugin for PPP to get passwords via a pipe"
DESCRIPTION_ppp-tools = "The pppdump and pppstats utitilities"
RDEPENDS_ppp_minconn += "libpcap0.8"
-pkg_postinst() {
+pkg_postinst_${PN}() {
if test "x$D" != "x"; then
exit 1
else
diff --git a/openembedded/packages/prism3-support/files/hostap-fw-load b/openembedded/packages/prism3-support/files/hostap-fw-load
index 538a4a783..0b2aec51a 100644
--- a/openembedded/packages/prism3-support/files/hostap-fw-load
+++ b/openembedded/packages/prism3-support/files/hostap-fw-load
@@ -2,6 +2,8 @@
# Special case for prism3 cards needing firmware upload
# Add more known manfids, if necessary
+
+test -x /sbin/cardctl || exit 0
if [ `cardctl info|grep "d601,0010\|d601,0101"` ]; then
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 031fdf7e9..dfe3f5a9f 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"
DEPENDS = "prism3-firmware hostap-utils"
RDEPENDS = "prism3-firmware hostap-utils"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r1"
PACKAGE_ARCH = "all"
-PR = "r0"
SRC_URI = "file://hostap-fw-load"
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 6bc844e8d..1c91485ed 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"
PROVIDES = "tslib"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
-PACKAGE_ARCH_tslib-conf = "${MACHINE}"
+PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \
file://ts.conf \
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index d13614c3a..cd2d65f51 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -4,8 +4,8 @@ PV = "0.0+cvs${SRCDATE}"
PR = "r32"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
-PACKAGE_ARCH_tslib-conf = "${MACHINE}"
-PACKAGE_ARCH_mnci = "${MACHINE}"
+PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
file://ts.conf \
@@ -27,10 +27,7 @@ EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-
EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
do_stage () {
- oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
- ln -sf libts-0.0.so ${STAGING_LIBDIR}/libts.so
- install -m 0644 src/tslib.h ${STAGING_INCDIR}/
- install -m 0644 src/tslib-private.h ${STAGING_INCDIR}/
+autotools_stage_all
}
do_install_prepend () {
@@ -41,7 +38,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/profile.d/
install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
case ${MACHINE} in
- h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270)
+ h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel)
install -d ${D}${datadir}/tslib
for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do
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 d3983df6b..3138e5554 100644
--- a/openembedded/packages/udev/udev-084/init
+++ b/openembedded/packages/udev/udev-084/init
@@ -56,7 +56,7 @@ mount_tmpfs() {
# I hate this hack. -- Md
make_extra_nodes() {
if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
- cp --preserve=all --recursive --update /lib/udev/devices/* /dev/
+ cp -a /lib/udev/devices/* /dev/
fi
[ -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 b3a19cefc..6308cb091 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"
KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
# Firmware Helper
-ACTION=="add", SUBSYSTEM=="firmware", RUN+="/usr/lib/udev/firmware_helper"
+ACTION=="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 b5bf46425..904f73783 100644
--- a/openembedded/packages/udev/udev_084.bb
+++ b/openembedded/packages/udev/udev_084.bb
@@ -1,3 +1,5 @@
+DEFAULT_PREFERENCE = "-1"
+
DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
/dev/, handles hotplug events and loads drivers at boot time. It replaces \
the 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 ."
PR = "r1"
+FILES_${PN} += "${base_libdir}"
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev"
do_install () {
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 aa2c0ec85..3c8b4a030 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}"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/xau/xau_cvs.bb b/openembedded/packages/xau/xau_cvs.bb
index 58c47dd62..46958baf1 100644
--- a/openembedded/packages/xau/xau_cvs.bb
+++ b/openembedded/packages/xau/xau_cvs.bb
@@ -13,10 +13,5 @@ S = "${WORKDIR}/Xau"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
+ autotools_stage_all
}
diff --git a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
index f28e0edf4..31a60a320 100644
--- a/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/openembedded/packages/xcalibrate/xcalibrate_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "BSD-X"
SECTION = "x11/libs"
PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@freedesktop.org>"
DEPENDS = "x11 xcalibrateext xext"
DESCRIPTION = "XCalibrate client-side library"
@@ -12,9 +11,5 @@ S = "${WORKDIR}/XCalibrate"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
index e24256423..133d19ee3 100644
--- a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
+++ b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
@@ -1,7 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
SECTION = "x11/libs"
LICENSE = "BSD-X"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DESCRIPTION = "XCalibrate extension headers"
SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt"
@@ -10,9 +9,5 @@ S = "${WORKDIR}/XCalibrateExt"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/xcomposite/xcomposite_cvs.bb b/openembedded/packages/xcomposite/xcomposite_cvs.bb
index e0a7e2b64..8469e9c36 100644
--- a/openembedded/packages/xcomposite/xcomposite_cvs.bb
+++ b/openembedded/packages/xcomposite/xcomposite_cvs.bb
@@ -10,9 +10,5 @@ S = "${WORKDIR}/Xcomposite"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/xmu/xmu_cvs.bb b/openembedded/packages/xmu/xmu_cvs.bb
index 7cf267dbb..3f62a8964 100644
--- a/openembedded/packages/xmu/xmu_cvs.bb
+++ b/openembedded/packages/xmu/xmu_cvs.bb
@@ -2,7 +2,6 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
SECTION = "x11/libs"
PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "xt xext"
PR = "r2"
@@ -17,5 +16,5 @@ FILES_xmuu-dev = "${libdir}/libXmuu.so"
inherit autotools pkgconfig
do_stage () {
- oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+ autotools_stage_all
}
diff --git a/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb b/openembedded/packages/xproto/xproto_6.6.2+cvs20050226.bb
index 33241b3d0..a5a92fee4 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"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- mandir=${STAGING_DATADIR}/man \
- datadir=${STAGING_DATADIR}
+ autotools_stage_all
}
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 f56497ceb..16ac1049b 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 @@
DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
-DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://etc"
S = ${WORKDIR}
+PACKAGE_ARCH = "all"
+
do_install() {
cp -R ${S}/etc ${D}/etc
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 d7aad8b4d..3ea41de7f 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"
SRC_URI = "file://xserver-nodm"
S = ${WORKDIR}
+PACKAGE_ARCH = "all"
+
do_install() {
install -d ${D}/etc
install -d ${D}/etc/init.d