diff options
32 files changed, 894 insertions, 51 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 7e526e17da..56a13ff309 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -324,7 +324,6 @@ python base_do_mrproper() { addtask fetch do_fetch[dirs] = "${DL_DIR}" -do_fetch[nostamp] = "1" python base_do_fetch() { import sys diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4f732ecc2a..ca7ddc873d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -46,6 +46,8 @@ require conf/distro/include/preferred-opie-versions.inc # GPE require conf/distro/include/preferred-gpe-versions-2.8.inc +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" + PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" @@ -55,10 +57,12 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc +PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" + # E require conf/distro/include/preferred-e-versions.inc @@ -120,7 +124,7 @@ PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.91" +PREFERRED_VERSION_dbus ?= "0.92" PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" @@ -140,21 +144,23 @@ PCMCIA_MANAGER_tosa = "pcmciautils" PCMCIA_MANAGER_poodle = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_h2200 = "pcmciautils" +PCMCIA_MANAGER_h4000 = "pcmciautils" PCMCIA_MANAGER_h6300 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" # add altboot to compatible models, will be replaced with angstrom-bootmanager -EXTRA_STUFF_append_c7x0 = "altboot" -EXTRA_STUFF_append_akita = "altboot" -EXTRA_STUFF_append_spitz = "altboot" -EXTRA_STUFF_append_poodle = "altboot" -EXTRA_STUFF_append_tosa = "altboot" +#EXTRA_STUFF_append_c7x0 = "altboot" +#EXTRA_STUFF_append_akita = "altboot" +#EXTRA_STUFF_append_spitz = "altboot" +#EXTRA_STUFF_append_poodle = "altboot" +#EXTRA_STUFF_append_tosa = "altboot" ### GPE section ### #Install libgtkinput in devices without a keyboard GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 3bff27763d..e668c3ce38 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -8,33 +8,41 @@ DISTRO_VERSION = "donkey" export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com" -# No uniroot +#<>-----------------------------------------------------------------> +#<> No uniroot +#<>-----------------------------------------------------------------< PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -#<> + +#<>-----------------------------------------------------------------> #<> We will set CVS DATE when things are known to work. -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + +#<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 #<> Also, select version of modules (and kernel) -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel" PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}" -#<> + +#<>-----------------------------------------------------------------> #<>We want kdrive as our default X-Server. -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0" +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -#<> +#<>-----------------------------------------------------------------> #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers -#<> +#<>-----------------------------------------------------------------< PREFERRED_VERSION_binutils = "2.17" PREFERRED_VERSION_binutils-cross = "2.17" PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7" @@ -44,76 +52,101 @@ PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" PREFERRED_VERSION_glibc = "2.4" PREFERRED_VERSION_glibc-intermediate = "2.4" -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -#<> -#<>Setting Preferred glib-2.0,glib-1.2 -#<> +#<>------------------------------------------------------------------> +#<>Setting Preferred glib, dbus, db-native +#<>------------------------------------------------------------------< PREFERRED_VERSION_glib-2.0-native = "2.6.5" PREFERRED_VERSION_glib-1.2-native = "1.2.10" -PREFERRED_VERSION_glib-2.0 = "2.10.0" +PREFERRED_VERSION_glib-2.0 = "2.12.0" PREFERRED_VERSION_glib-1.2 = "1.2.10" +PREFERRED_VERSION_pango = "1.12.0" +PREFERRED_VERSION_dbus = "0.61" +PREFERRED_VERSION_dbus-native = "0.61" +PREFERRED_PROVIDER_dbus-glib = "dbus" +PREFERRED_PROVIDER_virtual/db-native = "db-native" + +#<>------------------------------------------------------------------> #<> #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11. -#<> +#<>------------------------------------------------------------------< PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" PREFERRED_PROVIDER_tslib = "tslib" -PREFRRED_VERSION_cairo = "1.0.4" -#<> + + +#<>------------------------------------------------------------------> #<>Other Specific stuff. #<> #<> #<>We want to be able to build this for all jornadas so #<>to not mess up the folders we need to make them dynamic. #<>It will use different folders depending on Arch (set in local.conf) +#<>------------------------------------------------------------------< SRC_DIST_LOCAL = "copy" INHERIT += "package_ipk package_tar multimachine src_distribute_local" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" + +#<>------------------------------------------------------------------> #<>What we want on the bootstrap image (extra) #<> -#<> +#<>------------------------------------------------------------------< BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools \ udev e2tools e2fsprogs kernel-modules keymaps \ wget" -#<> + +#<>------------------------------------------------------------------> #<>What Qte, libqte.. versions should we use. -#<> +#<>------------------------------------------------------------------< QTE_VERSION = "2.3.10" PALMTOP_USE_MULTITHREADED_QT = "yes" OPIE_VERSION = "1.2.2" require conf/distro/include/preferred-opie-versions.inc -#<> + +#<>------------------------------------------------------------------> #<> Lets decide on a GPE versipns -#<> +#<> And lets override GTK to something that builds +#<>------------------------------------------------------------------< require conf/distro/include/preferred-gpe-versions-2.7.inc +PREFERRED_VERSION_gtk+ = "2.8.16" +PREFERRED_VERSION_pango = "1.12.0" +PREFERRED_VERSION_cairo = "1.2.2" +PREFERRED_VERSION_gtk-engines = "2.7.4" -#<> + +#<>------------------------------------------------------------------> #<> We want pcmciautils, not pcmcia-cs -#<> +#<>------------------------------------------------------------------< PCMCIA_MANAGER = "pcmciautils" -#<> + +#<>------------------------------------------------------------------> #<> We are using gcc 4.1.1 so lets keep optimizations low -#<> +#<>------------------------------------------------------------------< FULL_OPTIMIZATION = "-O1" -#<> + +#<>------------------------------------------------------------------> #<>Our Image files should look abit better. #<> -#<> +#<>------------------------------------------------------------------< IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}" + +#<>------------------------------------------------------------------> #<> #<> +#<> General non-essential programs with known working versions #<> -#<> General non-essential programs -#<> -#<> -PREFERRED_VERSION_irssi = "0.8.10"
\ No newline at end of file +#<>------------------------------------------------------------------< +PREFERRED_VERSION_irssi = "0.8.10" +PREFERRED_VERSION_mc = "4.6.1" +PREFERRED_VERSION_nano = "1.3.9" +PREFERRED_VERSION_ncurses = "5.4" +PREFERRED_VERSION_ncftp = "3.1.9"
\ No newline at end of file diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index bf653d9e97..410de9a100 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,13 +2,16 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx +INHERIT += "linux_modules" + TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h4000" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" ROOT_FLASH_SIZE = "32" +PCMCIA_MANAGER = "pcmciautils" BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}" @@ -21,16 +24,15 @@ H4000_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" -SERIAL_CONSOLE = "115200 tts/0 vt100" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf # LAB can only resolve relative symlinks ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " diff --git a/packages/base-files/base-files/tosa/usbd b/packages/base-files/base-files/tosa/usbd index 40931ee8e9..8c80044167 100644 --- a/packages/base-files/base-files/tosa/usbd +++ b/packages/base-files/base-files/tosa/usbd @@ -1 +1,5 @@ -usbdmodule=pxa_bi +# I know that this was created for usb-client stuff +# but tosa/2.6 need (un)loading USB Host module +# on suspend/resume and this way is simplest one ;) + +usbdmodule=ohci-hcd diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 85c0e84d6e..d4c03bdefe 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/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 = "r53" +PR = "r54" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/dbus/dbus_0.92.bb b/packages/dbus/dbus_0.92.bb new file mode 100644 index 0000000000..a4ab61322f --- /dev/null +++ b/packages/dbus/dbus_0.92.bb @@ -0,0 +1,64 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "base" +PR = "r1" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init \ + file://fix-segfault.patch;patch=1 \ + file://fix-install-daemon.patch;patch=1" + +inherit autotools pkgconfig update-rc.d gettext + +INITSCRIPT_NAME = "dbus-1" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" + +FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include" + +pkg_postinst_dbus() { +#!/bin/sh + +# can't do adduser stuff offline +if [ "x$D" != "x" ]; then + exit 1 +fi + +MESSAGEUSER=messagebus +MESSAGEHOME=/var/run/dbus + +mkdir -p $MESSAGEHOME || true +chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +} + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + +do_stage () { + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ + install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_dbus', 'dbus-1', d) +} diff --git a/packages/gpe-screenshot/files/.mtn2git_empty b/packages/gpe-screenshot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-screenshot/files/.mtn2git_empty diff --git a/packages/gpe-screenshot/files/fix-segfault.patch b/packages/gpe-screenshot/files/fix-segfault.patch new file mode 100644 index 0000000000..dc185a9b51 --- /dev/null +++ b/packages/gpe-screenshot/files/fix-segfault.patch @@ -0,0 +1,36 @@ +Index: src/gpe-screenshot.c +=================================================================== +RCS file: /cvs/gpe/base/gpe-screenshot/src/gpe-screenshot.c,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -u -r1.1 -r1.2 +--- src/gpe-screenshot.c 1 Nov 2005 20:54:38 -0000 1.1 ++++ src/gpe-screenshot.c 10 Aug 2006 15:07:21 -0000 1.2 +@@ -334,10 +334,9 @@ + { + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); + +- g_object_set (mainDlg->ok_button, "use-stock", FALSE); +- g_object_set (mainDlg->ok_button, "use-underline", TRUE); +- g_object_set (mainDlg->ok_button, "label", "_Upload"); +- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); ++ gtk_button_set_use_stock (mainDlg->ok_button, FALSE); ++ gtk_button_set_label (mainDlg->ok_button, "_Upload"); ++ gtk_button_set_image (mainDlg->ok_button, icon); + + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), FALSE); +@@ -347,10 +346,9 @@ + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON); + + /* for some odd reason use-stock doesn't have any effect. set the image manually...*/ +- g_object_set (mainDlg->ok_button, "use-stock", TRUE); +- g_object_set (mainDlg->ok_button, "use-underline", TRUE); +- g_object_set (mainDlg->ok_button, "label", GTK_STOCK_SAVE); +- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); ++ gtk_button_set_label (mainDlg->ok_button, GTK_STOCK_SAVE); ++ gtk_button_set_use_stock (mainDlg->ok_button, TRUE); ++ gtk_button_set_image (mainDlg->ok_button, icon); + + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), TRUE); diff --git a/packages/gpe-screenshot/gpe-screenshot_0.4.bb b/packages/gpe-screenshot/gpe-screenshot_0.4.bb index 283d28d5aa..b64bdceb04 100644 --- a/packages/gpe-screenshot/gpe-screenshot_0.4.bb +++ b/packages/gpe-screenshot/gpe-screenshot_0.4.bb @@ -3,7 +3,10 @@ LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "gpe" +PR = "r1" DEPENDS = "glib-2.0 gtk+ libglade" inherit gpe autotools + +SRC_URI += "file://fix-segfault.patch;patch=1;pnum=0 " diff --git a/packages/keymaps/files/h2200/.mtn2git_empty b/packages/keymaps/files/h2200/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymaps/files/h2200/.mtn2git_empty diff --git a/packages/keymaps/files/h2200/keymap-2.6.map b/packages/keymaps/files/h2200/keymap-2.6.map new file mode 100644 index 0000000000..8b4c43fe0b --- /dev/null +++ b/packages/keymaps/files/h2200/keymap-2.6.map @@ -0,0 +1,17 @@ +# Kernel keymap for h2200 keys + +# Apps keys +keycode 67 = F9 +keycode 68 = F10 +keycode 87 = F11 +keycode 88 = F12 + +# Joypad +keycode 103 = Up +keycode 105 = Left +keycode 106 = Right +keycode 108 = Down +keycode 28 = Return + +# Power key +keycode 116 = F34 diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index aae29cd23f..aa393af203 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -33,7 +33,12 @@ HHV = "0" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" + do_configure() { + if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then + die "-hh version mismatch" + fi + # Substitute our uid/gid so the initramfs gets the right ownership. MY_UID=`id -u` MY_GID=`id -g` diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index e00598d937..7dfcb4d237 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -3,10 +3,10 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r2" +PR = "r3" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|ipaq-pxa270|htcuniversal)' +COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|h4000|ipaq-pxa270|htcuniversal)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 0bb2e3a645..bba29ac1d6 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -198,3 +198,7 @@ do_deploy() { do_deploy[dirs] = "${S}" addtask deploy before do_package after do_install + +# wlan-ng stuff need compiled kernel sources +do_rm_work() { +} diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index bd30de0562..950f9fd787 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ require linux-openzaurus.inc -PR = "r15" +PR = "r16" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc index f82b66a0e9..16f471356a 100644 --- a/packages/matchbox-panel/matchbox-panel.inc +++ b/packages/matchbox-panel/matchbox-panel.inc @@ -11,6 +11,7 @@ EXTRA_OECONF = " --enable-startup-notification --enable-dnotify " EXTRA_OECONF_append_h3600 = " --enable-small-icons " EXTRA_OECONF_append_h3900 = " --enable-small-icons " EXTRA_OECONF_append_h2200 = " --enable-small-icons " +EXTRA_OECONF_append_h4000 = " --enable-small-icons " EXTRA_OECONF_append_collie = " --enable-small-icons " EXTRA_OECONF_append_poodle = " --enable-small-icons " EXTRA_OECONF_append_mnci = " --enable-small-icons " diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index d79dbc2a26..8c0652daec 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r11" +PR = "r12" inherit update-rc.d diff --git a/packages/tslib/tslib/h4000/.mtn2git_empty b/packages/tslib/tslib/h4000/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/h4000/.mtn2git_empty diff --git a/packages/tslib/tslib/h4000/tslib.sh b/packages/tslib/tslib/h4000/tslib.sh new file mode 100644 index 0000000000..0de3534a51 --- /dev/null +++ b/packages/tslib/tslib/h4000/tslib.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +module_id() { + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +case `uname -r` in +2.4*) + TSLIB_TSDEVICE=/dev/touchscreen/0raw + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 + ;; +*) + TSLIB_TSDEVICE=`detect-stylus --device` + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf + ;; +esac + +export TSLIB_TSDEVICE TSLIB_CONFFILE + diff --git a/packages/udev/udev-092/50-hostap_cs.rules b/packages/udev/files/50-hostap_cs.rules index efefdc58fc..efefdc58fc 100644 --- a/packages/udev/udev-092/50-hostap_cs.rules +++ b/packages/udev/files/50-hostap_cs.rules diff --git a/packages/udev/udev-097/.mtn2git_empty b/packages/udev/udev-097/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-097/.mtn2git_empty diff --git a/packages/udev/udev-097/flags.patch b/packages/udev/udev-097/flags.patch new file mode 100644 index 0000000000..492a39881c --- /dev/null +++ b/packages/udev/udev-097/flags.patch @@ -0,0 +1,51 @@ +--- udev-089/Makefile.orig 2006-04-08 13:32:53.000000000 +0200 ++++ udev-089/Makefile 2006-04-08 13:34:27.000000000 +0200 +@@ -117,28 +117,28 @@ + AR = $(CROSS_COMPILE)ar + RANLIB = $(CROSS_COMPILE)ranlib + +-CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ + -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ + -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes +-CFLAGS += $(WARNINGS) ++override CFLAGS += $(WARNINGS) + + LDFLAGS = -Wl,-warn-common + + OPTFLAGS = -Os +-CFLAGS += $(OPTFLAGS) ++override CFLAGS += $(OPTFLAGS) + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -DDEBUG ++ override CFLAGS += -DDEBUG + endif + + ifeq ($(strip $(USE_GCOV)),true) +- CFLAGS += -fprofile-arcs -ftest-coverage ++ override CFLAGS += -fprofile-arcs -ftest-coverage + LDFLAGS += -fprofile-arcs + endif + +@@ -151,11 +151,11 @@ + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux -lsepol +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC ++ override CFLAGS += -DUSE_STATIC + LDFLAGS += -static + endif + diff --git a/packages/udev/udev-097/init b/packages/udev/udev-097/init new file mode 100644 index 0000000000..cc25c026a3 --- /dev/null +++ b/packages/udev/udev-097/init @@ -0,0 +1,242 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: udev +# Required-Start: mountvirtfs +# Required-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Start udevd, populate /dev and load drivers. +### END INIT INFO + +# we need to unmount /dev/pts/ and remount it later over the tmpfs +unmount_devpts() { + if mountpoint -q /dev/pts/; then + umount -l /dev/pts/ + fi + + if mountpoint -q /dev/shm/; then + umount -l /dev/shm/ + fi +} + +# mount a tmpfs over /dev, if somebody did not already do it +mount_tmpfs() { + if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then + return + fi + + # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. + # /etc/udev/ is recycled as a temporary mount point because it's the only + # directory which is guaranteed to be available. + mount -n -o bind /dev /etc/udev + + if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then + umount /etc/udev + echo "udev requires tmpfs support, not started." + exit 1 + fi + + mkdir -p /dev/.static/dev + chmod 700 /dev/.static/ + # The mount options in busybox are non-standard... + if test -x /bin/mount.util-linux + then + /bin/mount.util-linux --move /etc/udev /dev/.static/dev + elif test -x /bin/busybox + then + busybox mount -n -o move /etc/udev /dev/.static/dev + else + echo "udev requires an identifiable mount command, not started." + umount /etc/udev + umount /dev + exit 1 + fi +} + +create_dev_makedev() { + if [ -e /sbin/MAKEDEV ]; then + [ ! -e /dev/MAKEDEV ] || ln -s /sbin/MAKEDEV /dev/MAKEDEV + else + ln -s /bin/true /dev/MAKEDEV + fi +} + +# I hate this hack. -- Md +make_extra_nodes() { + if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then + cp -a /lib/udev/devices/* /dev/ + fi + + [ -e /etc/udev/links.conf ] || return 0 + grep '^[^#]' /etc/udev/links.conf | \ + while read type name arg1; do + [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue + case "$type" in + L) ln -s $arg1 /dev/$name ;; + D) mkdir -p /dev/$name ;; + M) mknod -m 600 /dev/$name $arg1 ;; + *) echo "links.conf: unparseable line ($type $name $arg1)" ;; + esac + done +} + +supported_kernel() { + case "$(uname -r)" in + 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; + 2.6.1[0-4]|2.6.1[0-4][!0-9]*) return 1 ;; + esac + return 0 +} + +load_input_modules() { + case "$(uname -r)" in + 2.6.1[0-5]|2.6.1[0-5][!0-9]*) ;; # <= 2.6.15 + *) return 0 + esac + + for module in mousedev evdev joydev; do + modprobe -q $module || true + done +} + +# shell version of /usr/bin/tty +my_tty() { + [ -x /bin/readlink ] || return 0 + [ -e /proc/self/fd/0 ] || return 0 + readlink --silent /proc/self/fd/0 || true +} + +warn_if_interactive() { + if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then + return + fi + + TTY=$(my_tty) + if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then + return + fi + + printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" + printf "has been run from an interactive shell.\n" + printf "It will probably not do what you expect, so this script will wait\n" + printf "60 seconds before continuing. Press ^C to stop it.\n" + printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" + sleep 60 +} + +############################################################################## + +[ -x /sbin/udevd ] || exit 0 + +PATH="/sbin:/bin:/usr/bin" + +# defaults +tmpfs_size="10M" +udev_root="/dev" + +if [ -e /etc/udev/udev.conf ]; then + . /etc/udev/udev.conf +fi + +if ! supported_kernel; then + echo "udev requires a kernel >= 2.6.15, not started." + exit 1 +fi + +if [ ! -e /proc/filesystems ]; then + echo "udev requires a mounted procfs, not started." + exit 1 +fi + +if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then + echo "udev requires tmpfs support, not started." + exit 1 +fi + +if [ ! -d /sys/class/ ]; then + echo "udev requires a mounted sysfs, not started." + exit 1 +fi + +if [ ! -e /proc/sys/kernel/hotplug ]; then + echo "udev requires hotplug support, not started." + exit 1 +fi + +############################################################################## + +# When modifying this script, do not forget that between the time that +# the new /dev has been mounted and udevsynthesize has been run there will be +# no /dev/null. This also means that you cannot use the "&" shell command. + +udev_root=${udev_root%/} + +case "$1" in + start) + if [ -e "$udev_root/.udev/" ]; then + if mountpoint -q $udev_root/; then + TMPFS_MOUNTED=1 + else + echo ".udev/ already exists on the static $udev_root!" + fi + else + warn_if_interactive + fi + + echo > /proc/sys/kernel/hotplug + + if [ -z "$TMPFS_MOUNTED" ]; then + unmount_devpts + mount_tmpfs + [ -d /proc/1 ] || mount -n /proc + fi + + # /dev/null must be created before udevd is started + make_extra_nodes + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + + # if this directory is not present /dev will not be updated by udev + mkdir -p /dev/.udev/db/ /dev/.udev/queue/ + + echo "Synthesizing the initial hotplug events" + udevtrigger + + load_input_modules + create_dev_makedev + + # wait for the udevd childs to finish + echo "Waiting for /dev to be fully populated" + if ! udevsettle; then + echo 'timeout' + fi + ;; + + stop) + echo "Stopping the hotplug events dispatcher" "udevd" + start-stop-daemon --stop --name udevd --quiet + ;; + + restart) + echo "Stopping the hotplug events dispatcher" "udevd" + if start-stop-daemon --stop --name udevd --quiet ; then + exit 1 + fi + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + ;; + + reload) + udevcontrol reload_rules + ;; + + *) + echo "Usage: /etc/init.d/udev {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit 0 + diff --git a/packages/udev/udev-097/local.rules b/packages/udev/udev-097/local.rules new file mode 100644 index 0000000000..2308b52c4a --- /dev/null +++ b/packages/udev/udev-097/local.rules @@ -0,0 +1,31 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL=="rtc0", SYMLINK+="rtc" + +# Try and modprobe for drivers for new hardware +ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" + +# Create a symlink to any touchscreen input device +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev-097/permissions.rules b/packages/udev/udev-097/permissions.rules new file mode 100644 index 0000000000..8da35c3090 --- /dev/null +++ b/packages/udev/udev-097/permissions.rules @@ -0,0 +1,109 @@ +ACTION!="add", GOTO="permissions_end" + +# workarounds needed to synchronize with sysfs +DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" +SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" +# only needed for kernels < 2.6.16 +SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" +# only needed for kernels < 2.6.17 +SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" + +# default permissions for block devices +SUBSYSTEM=="block", GROUP="disk" +SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" + +# IDE devices +BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \ + IMPORT{program}="cdrom_id --export $tempnode" +ENV{ID_CDROM}=="?*", GROUP="cdrom" +BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" +BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" + +# SCSI devices +BUS=="scsi", SYSFS{type}=="1", GROUP="tape" +BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner" +BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" +BUS=="scsi", SYSFS{type}=="6", GROUP="scanner" + +# USB devices +BUS=="usb", KERNEL=="legousbtower*", MODE="0666" +BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" + +# usbfs-like devices +SUBSYSTEM=="usb_device", MODE="0664" + +# iRiver music players +SUBSYSTEM=="usb_device", GROUP="plugdev", \ + SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]" + +# serial devices +SUBSYSTEM=="tty", GROUP="dialout" +SUBSYSTEM=="capi", GROUP="dialout" +SUBSYSTEM=="slamr", GROUP="dialout" +SUBSYSTEM=="zaptel", GROUP="dialout" + +# vc devices (all members of the tty subsystem) +KERNEL=="ptmx", MODE="0666", GROUP="root" +KERNEL=="console", MODE="0600", GROUP="root" +KERNEL=="tty", MODE="0666", GROUP="root" +KERNEL=="tty[0-9]*", GROUP="root" +KERNEL=="pty*", MODE="0666", GROUP="tty" + +# video devices +SUBSYSTEM=="video4linux", GROUP="video" +SUBSYSTEM=="drm", GROUP="video" +SUBSYSTEM=="dvb", GROUP="video" +SUBSYSTEM=="em8300", GROUP="video" +SUBSYSTEM=="graphics", GROUP="video" +SUBSYSTEM=="nvidia", GROUP="video" + +# misc devices +KERNEL=="random", MODE="0666" +KERNEL=="urandom", MODE="0666" +KERNEL=="mem", MODE="0640", GROUP="kmem" +KERNEL=="kmem", MODE="0640", GROUP="kmem" +KERNEL=="port", MODE="0640", GROUP="kmem" +KERNEL=="full", MODE="0666" +KERNEL=="null", MODE="0666" +KERNEL=="zero", MODE="0666" +KERNEL=="inotify", MODE="0666" +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" +KERNEL=="agpgart", GROUP="video" +KERNEL=="nvram", GROUP="nvram" +KERNEL=="rtc", GROUP="audio" +KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" +KERNEL=="fuse", GROUP="fuse" + +KERNEL=="cdemu[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd", MODE="0644" + +KERNEL=="uverbs*", GROUP="rdma" +KERNEL=="ucm*", GROUP="rdma" + +# printers and parallel devices +SUBSYSTEM=="printer", GROUP="lp" +SUBSYSTEM=="ppdev", GROUP="lp" +KERNEL=="pt[0-9]*", GROUP="tape" +KERNEL=="pht[0-9]*", GROUP="tape" + +# sound devices +SUBSYSTEM=="sound", GROUP="audio" + +# ieee1394 devices +KERNEL=="raw1394", GROUP="disk" +KERNEL=="dv1394*", GROUP="video" +KERNEL=="video1394*", GROUP="video" + +# input devices +KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \ + MODE="0664", GROUP="video" +KERNEL=="js[0-9]*", MODE="0664" + +# AOE character devices +SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" +SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" + +LABEL="permissions_end" + diff --git a/packages/udev/udev-097/udev.rules b/packages/udev/udev-097/udev.rules new file mode 100644 index 0000000000..9c4ea4214d --- /dev/null +++ b/packages/udev/udev-097/udev.rules @@ -0,0 +1,98 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# SCSI devices +BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" + +# USB devices +BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" +BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" +BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" +BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ + SYMLINK+="pilot" + +# usbfs-like devices +SUBSYSTEM=="usb_device", \ + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + +# serial devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" +KERNEL=="capi[0-9]*", NAME="capi/%n" + +# video devices +KERNEL=="card[0-9]*", NAME="dri/%k" + +# misc devices +KERNEL=="hw_random", NAME="hwrng" +KERNEL=="tun", NAME="net/%k" + +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL=="pktcdvd", NAME="pktcdvd/control" + +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" +KERNEL=="uverbs*", NAME="infiniband/%k" +KERNEL=="ucm", NAME="infiniband/%k" + +KERNEL=="buzzer", NAME="misc/buzzer" + +# ALSA devices +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# ieee1394 devices +KERNEL=="dv1394*", NAME="dv1394/%n" +KERNEL=="video1394*", NAME="video1394/%n" + +# input devices +KERNEL=="mice", NAME="input/%k" +KERNEL=="mouse[0-9]*", NAME="input/%k" +KERNEL=="event[0-9]*", NAME="input/%k" +KERNEL=="js[0-9]*", NAME="input/%k" +KERNEL=="ts[0-9]*", NAME="input/%k" +KERNEL=="uinput", NAME="input/%k" + +# Zaptel +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# AOE character devices +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" + +# device mapper creates its own device nodes, so ignore these +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" +KERNEL=="device-mapper", NAME="mapper/control" + +KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" + +# Firmware Helper +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index 5b7024cd72..5245d6e2b3 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \ +DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \ /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." LICENSE = "GPL" diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb new file mode 100644 index 0000000000..2e9e8d500f --- /dev/null +++ b/packages/udev/udev_097.bb @@ -0,0 +1,63 @@ +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.15." +DESCRIPTION_libvolume-id = "libvolume_id shared library, \ +used to detect the type of a file system and read its metadata." +DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ +needed to link programs with libvolume_id." + +PR = "r0" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://mount.blacklist \ + " + +require udev.inc + +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" + +INITSCRIPT_PARAMS = "start 03 S ." + +PACKAGES =+ "libvolume-id-dev libvolume-id" +PKG_libvolume-id-dev = "libvolume-id-dev" +FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc" +FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" +FILES_${PN} += "${base_libdir}/udev/*" +FILES_${PN}-dbg += "${base_libdir}/udev/.debug" +UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" +EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" + +do_install () { + install -d ${D}${usrsbindir} \ + ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + + install -d ${D}${sysconfdir}/udev/rules.d/ + + install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules + install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf + if [ "${UDEV_DEVFS_RULES}" = "1" ]; then + install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules + fi + + install -d ${D}${sysconfdir}/udev/scripts/ + + install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh + install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts + + install -d ${D}${base_libdir}/udev/ +} + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} diff --git a/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch new file mode 100644 index 0000000000..afa34712e2 --- /dev/null +++ b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch @@ -0,0 +1,54 @@ +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/configure.ac liblbxutil-X11R7.0-1.0.0/configure.ac +--- liblbxutil-X11R7.0-1.0.0_orig/configure.ac 2005-12-15 00:24:36.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/configure.ac 2006-08-21 18:32:04.000000000 +0000 +@@ -60,4 +60,5 @@ + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am liblbxutil-X11R7.0-1.0.0/src/Makefile.am +--- liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am 2005-10-16 02:07:10.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/src/Makefile.am 2006-08-21 18:32:04.000000000 +0000 +@@ -1,9 +1,6 @@ + lib_LTLIBRARIES = liblbxutil.la + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -28,9 +25,8 @@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 + +diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am +--- liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am 1970-01-01 00:00:00.000000000 +0000 ++++ liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am 2006-08-21 18:32:04.000000000 +0000 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb index df8b267601..57b2987968 100644 --- a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb @@ -1,5 +1,7 @@ require xorg-lib-common.inc +SRC_URI += "file://mkg3states-1.0.0.patch;patch=0" + DESCRIPTION = "XFIXES Extension" DEPENDS += " xextproto xproto zlib" diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 26cf1e5453..3a45a2bf74 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -28,4 +28,4 @@ do_deploy() { esac } -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_compile |