diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/angstrom/task-angstrom.bb | 3 | ||||
-rw-r--r-- | packages/gtk+/gtk+_2.8.9.bb | 6 | ||||
-rw-r--r-- | packages/ipaq-sleep/files/install-fix.patch | 11 | ||||
-rw-r--r-- | packages/ipaq-sleep/ipaq-sleep_0.9.bb | 1 | ||||
-rw-r--r-- | packages/linux/handhelds-pxa-2.6/h5xxx/defconfig | 6 | ||||
-rw-r--r-- | packages/nautilus/nautilus_2.12.2.bb | 2 | ||||
-rw-r--r-- | packages/ntp/ntp_4.2.0.bb | 4 | ||||
-rw-r--r-- | packages/sqlite/sqlite3_3.2.2.bb | 2 | ||||
-rw-r--r-- | packages/sqlite/sqlite3_3.2.5.bb | 2 | ||||
-rw-r--r-- | packages/sqlite/sqlite3_3.2.7.bb | 2 | ||||
-rw-r--r-- | packages/udev/udev-092/50-hostap_cs.rules | 4 | ||||
-rw-r--r-- | packages/udev/udev_092.bb | 12 |
12 files changed, 40 insertions, 15 deletions
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 059e856028..c8c84c3e5e 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r16" +PR = "r17" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -35,6 +35,7 @@ RDEPENDS_angstrom-base-depends = "\ ipkg ipkg-collateral \ wireless-tools \ tslib-tests tslib-calibrate \ + util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ ${PCMCIA_MANAGER} \ diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb index 817d179f9f..d2c3cd52e7 100644 --- a/packages/gtk+/gtk+_2.8.9.bb +++ b/packages/gtk+/gtk+_2.8.9.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -35,8 +35,8 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/ipaq-sleep/files/install-fix.patch b/packages/ipaq-sleep/files/install-fix.patch new file mode 100644 index 0000000000..59eb17b071 --- /dev/null +++ b/packages/ipaq-sleep/files/install-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile 2006-08-12 12:16:47.000000000 +0200 ++++ ipaq-sleep-0.9/Makefile 2006-08-12 12:22:42.188306000 +0200 +@@ -24,7 +24,7 @@ + $(CC) -o $(PACKAGE) $(PACKAGE).o $(LDFLAGS) $(PACKAGE_LDFLAGS) + + install-program: all +- install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)/etc/init.d + install $(PACKAGE).init $(DESTDIR)/etc/init.d/$(PACKAGE) + install $(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE).conf diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb index ba9eb14bc7..2855dcd965 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb @@ -7,6 +7,7 @@ SECTION = "x11/base" RDEPENDS = "apm" SRC_URI_append = " file://init-script-busybox.patch;patch=1" +SRC_URI_append = " file://install-fix.patch;patch=1" PR = "r1" diff --git a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig index 0034b9142c..82f309c895 100644 --- a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig +++ b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-hh5 -# Thu Aug 10 14:18:29 2006 +# Sat Aug 12 10:50:22 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -191,13 +191,13 @@ CONFIG_IPAQ_HANDHELD=y # Compaq/HP iPAQ Drivers # CONFIG_IPAQ_CLOCKS=y -CONFIG_IPAQ_SLEEVE=m +CONFIG_IPAQ_SLEEVE=y CONFIG_IPAQ_SAMCOP=y # CONFIG_IPAQ_HAMCOP is not set CONFIG_IPAQ_SAMCOP_TOUCHSCREEN=y # CONFIG_IPAQ_SAMCOP_FSI is not set # CONFIG_IPAQ_SAMCOP_SLEEVE is not set -# CONFIG_IPAQ_SAMCOP_DMA is not set +CONFIG_IPAQ_SAMCOP_DMA=y CONFIG_DMABOUNCE=y # diff --git a/packages/nautilus/nautilus_2.12.2.bb b/packages/nautilus/nautilus_2.12.2.bb index 6828c78c79..2f5628073e 100644 --- a/packages/nautilus/nautilus_2.12.2.bb +++ b/packages/nautilus/nautilus_2.12.2.bb @@ -5,7 +5,7 @@ inherit gnome LICENSE="GPL" -DEPENDS="librsvg eel esound gnome-desktop" +DEPENDS="librsvg libexif eel esound gnome-desktop" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb index d6d103f542..cc3ecb89dc 100644 --- a/packages/ntp/ntp_4.2.0.bb +++ b/packages/ntp/ntp_4.2.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome" SECTION = "console/network" PRIORITY = "optional" LICENSE = "ntp" -PR = "r7" +PR = "r8" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \ @@ -28,7 +28,7 @@ inherit autotools update-rc.d EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no" CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" -PACKAGES = "ntpdate ntp-bin ntp ntp-tickadj" +PACKAGES += "ntpdate ntp-bin ntp ntp-tickadj" # NOTE: you don't need ntpdate, use "ntpdc -q -g -x" PROVIDES = "ntpdate-${PV} ntpdate-${PV}-${PR} ntpdate" diff --git a/packages/sqlite/sqlite3_3.2.2.bb b/packages/sqlite/sqlite3_3.2.2.bb index e393c0963a..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.2.bb +++ b/packages/sqlite/sqlite3_3.2.2.bb @@ -1,2 +1,2 @@ -include sqlite3.inc +require sqlite3.inc PR = "r2" diff --git a/packages/sqlite/sqlite3_3.2.5.bb b/packages/sqlite/sqlite3_3.2.5.bb index e393c0963a..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.5.bb +++ b/packages/sqlite/sqlite3_3.2.5.bb @@ -1,2 +1,2 @@ -include sqlite3.inc +require sqlite3.inc PR = "r2" diff --git a/packages/sqlite/sqlite3_3.2.7.bb b/packages/sqlite/sqlite3_3.2.7.bb index e393c0963a..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.7.bb +++ b/packages/sqlite/sqlite3_3.2.7.bb @@ -1,2 +1,2 @@ -include sqlite3.inc +require sqlite3.inc PR = "r2" diff --git a/packages/udev/udev-092/50-hostap_cs.rules b/packages/udev/udev-092/50-hostap_cs.rules new file mode 100644 index 0000000000..efefdc58fc --- /dev/null +++ b/packages/udev/udev-092/50-hostap_cs.rules @@ -0,0 +1,4 @@ +# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards +# +ACTION=="add", DEVICE=="hostap_cs", \ + SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1" diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index 6a650b5f09..07b5eaa12f 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES = "hotplug" -PR = "r9" +PR = "r10" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -11,7 +11,11 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://udevsynthesize.patch;patch=1 \ file://udevsynthesize.sh \ file://arm_inotify_fix.patch;patch=1 \ - file://mount.blacklist" + file://mount.blacklist \ + " + +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" require udev.inc @@ -49,3 +53,7 @@ do_install () { install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize } + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} |