From 3590aa146e43b8c91d49dc2eeefe9a9c06821f8d Mon Sep 17 00:00:00 2001 From: Mike Westerhof <mwester@dls.net> Date: Wed, 10 Sep 2008 01:10:00 +0000 Subject: SlugOS: package feeds - subsume nas package; demote netatalk; remove openocd and dfu-util due to libusb conflicts (temporary, until that conflict can be resolved satisfactorily). --- packages/meta/slugos-packages.bb | 7 +++---- packages/tasks/task-mokogateway.bb | 15 +++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 946b51b210..5b745d2ca1 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r57" +PR = "r58" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -165,7 +165,6 @@ SLUGOS_PACKAGES = "\ ncftp \ ncurses \ net-tools \ - netatalk \ netcat \ netpbm \ nfs-utils \ @@ -179,7 +178,6 @@ SLUGOS_PACKAGES = "\ openobex-apps \ openntpd \ openobex \ - openocd \ openssh \ openvpn \ patch \ @@ -217,6 +215,7 @@ SLUGOS_PACKAGES = "\ streamripper \ stunnel \ sudo \ + swat \ sysfsutils \ syslog-ng \ tar \ @@ -262,6 +261,7 @@ SLUGOS_BROKEN_PACKAGES = "\ lirc-modules lirc \ madfu \ motion \ + netatalk \ openldap \ postfix \ pwc \ @@ -280,7 +280,6 @@ SLUGOS_EXTRA_PACKAGES ?= "" DEPENDS = "\ slugos-image \ slugos-native \ - task-nas-server-everything \ task-proper-tools \ ${SLUGOS_PACKAGES} \ ${SLUGOS_EXTRA_PACKAGES} \ diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb index 3df3f1fd03..1575b41780 100644 --- a/packages/tasks/task-mokogateway.bb +++ b/packages/tasks/task-mokogateway.bb @@ -1,7 +1,7 @@ DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution" LICENSE = "MIT" PROVIDES = "task-mokogateway-everything" -PR = "r4" +PR = "r5" inherit task @@ -73,9 +73,16 @@ RRECOMMENDS_task-mokogateway-wifi = "\ DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug" RDEPENDS_task-mokogateway-debug = "\ - dfu-util \ - openocd \ " +# The following packages are broken -- victims of libusb confusion. +# These packages depend upon libusb, which provides libusb.a -- however +# everything else depends upon libusb-compat, which also provides libusb.a +# (this includes bluez-*, usbutils-*, hal-*, libhal-*, etc). The wrong +# libusb.a is staged for at least somebody. The hacky solution right now +# is to not build these two utils, as they are the only ones in common use +# that DEPEND upon libusb. This needs to be fixed in a better way, but this +# will, at least, get the feeds working again. +# dfu-util \ +# openocd \ RRECOMMENDS_task-mokogateway-debug = "\ " - -- cgit v1.2.3 From a90dc1d37b49a3a036fd976a139f7ff794ec535b Mon Sep 17 00:00:00 2001 From: Mike Westerhof <mwester@dls.net> Date: Wed, 10 Sep 2008 02:09:07 +0000 Subject: slugos-packages: remove swat; already provided by the samba package. --- packages/meta/slugos-packages.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 5b745d2ca1..6311d09113 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -215,7 +215,6 @@ SLUGOS_PACKAGES = "\ streamripper \ stunnel \ sudo \ - swat \ sysfsutils \ syslog-ng \ tar \ -- cgit v1.2.3 From a640a4eee5363d717f32763ab06982bd629f2bd8 Mon Sep 17 00:00:00 2001 From: Rod Whitby <rod@whitby.id.au> Date: Wed, 10 Sep 2008 05:20:14 +0000 Subject: tzdata: Added Australia/Perth to the minimal set, since it is not covered by any of the others and it's about 5 times the size of Texas. --- packages/tzdata/tzdata_2007k.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb index c4a2adee19..76bbfe9ca3 100644 --- a/packages/tzdata/tzdata_2007k.bb +++ b/packages/tzdata/tzdata_2007k.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -PR = "r2" +PR = "r3" RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-arctic timezone-asia timezone-atlantic \ @@ -124,6 +124,7 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/Asia/Bankok \ ${datadir}/zoneinfo/Asia/Hong_Kong \ ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Perth \ ${datadir}/zoneinfo/Australia/Darwin \ ${datadir}/zoneinfo/Australia/Adelaide \ ${datadir}/zoneinfo/Australia/Brisbane \ -- cgit v1.2.3 From 3a7d5ef45859ff5f68ce601dd22ee0f8c96b7fd9 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@openembedded.org> Date: Wed, 10 Sep 2008 09:38:48 +0000 Subject: linux-omap git: remove most patches. They should be added back one-by-one to track down the display regression --- packages/linux/linux-omap_git.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index c596a95a71..2de27dafb1 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -6,19 +6,25 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm" -SRCREV = "b3f16ee00db9ec6b2ad53fc83fa913b42d3841be" +SRCREV = "2a4625ebb6538f9eef5d524b8e39e5c0c1316f9a" PV = "2.6.26+2.6.27-rc5+${PR}+git${SRCREV}" -PR = "r0" +PR = "r2" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" SRC_URI_append = " file://no-harry-potter.diff;patch=1 \ - file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \ file://timer-suppression.patch;patch=1 \ file://no-empty-flash-warnings.patch;patch=1 \ file://oprofile-0.9.3.armv7.diff;patch=1 \ + file://cache-display-fix.patch;patch=1 \ + file://4bitmmc.diff;patch=1 \ + file://no-cortex-deadlock.patch;patch=1 \ + file://read_die_ids.patch;patch=1 \ + " + +temporarely-disabled = " \ file://01-fix-timing-print.diff;patch=1 \ file://02-set-clkseld11.diff;patch=1 \ file://03-enable-overlay-opt.diff;patch=1 \ @@ -26,13 +32,9 @@ SRC_URI_append = " file://no-harry-potter.diff;patch=1 \ file://05-fix-display-panning.diff;patch=1 \ file://06-ensure-fclk.diff;patch=1 \ file://07-set-burst-size.diff;patch=1 \ - file://cache-display-fix.patch;patch=1 \ file://mru-clocks1.diff;patch=1 \ file://mru-clocks2.diff;patch=1 \ file://mru-clocks3.diff;patch=1 \ - file://4bitmmc.diff;patch=1 \ - file://no-cortex-deadlock.patch;patch=1 \ - file://read_die_ids.patch;patch=1 \ file://000-mru-make-video-mode-selcatable.diff;patch=1 \ file://001-mru-enable-overlay.diff;patch=1 \ file://002-mru-set-default-800x600.diff;patch=1 \ -- cgit v1.2.3 From 32ad8879a615b0cf98a7a0faa0b560de89e03b89 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@openembedded.org> Date: Wed, 10 Sep 2008 09:41:55 +0000 Subject: angstrom led config: match kernel change for beagleboard: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff;h=830588a772757cc522893634e1a88773bacaf1b0 --- packages/angstrom/angstrom-led-config.bb | 2 +- packages/angstrom/angstrom-led-config/beagleboard/leds | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/angstrom/angstrom-led-config.bb b/packages/angstrom/angstrom-led-config.bb index 6a4f26240e..12cdb96d93 100644 --- a/packages/angstrom/angstrom-led-config.bb +++ b/packages/angstrom/angstrom-led-config.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Configuration files for runtime LED configuration" #PV = "${DISTRO_VERSION}" -PR = "r3" +PR = "r4" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d diff --git a/packages/angstrom/angstrom-led-config/beagleboard/leds b/packages/angstrom/angstrom-led-config/beagleboard/leds index 4a567996ee..b50fedd783 100644 --- a/packages/angstrom/angstrom-led-config/beagleboard/leds +++ b/packages/angstrom/angstrom-led-config/beagleboard/leds @@ -1,3 +1,3 @@ #file format: name trigger -beagleboard::usr0 mmc0 -beagleboard::usr1 nand-disk +beagleboard::usr0 heartbeat +beagleboard::usr1 mmc0 -- cgit v1.2.3 From e0929b8a7831d58d85fa60c0531bcaea267d8a39 Mon Sep 17 00:00:00 2001 From: Philip Balister <philip@balister.org> Date: Wed, 10 Sep 2008 11:52:47 +0000 Subject: linux-omap_git.bb : Add patch to work around problem with install command. --- packages/linux/linux-omap/fix-install.patch | 23 +++++++++++++++++++++++ packages/linux/linux-omap_git.bb | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-omap/fix-install.patch (limited to 'packages') diff --git a/packages/linux/linux-omap/fix-install.patch b/packages/linux/linux-omap/fix-install.patch new file mode 100644 index 0000000000..46bc25a50b --- /dev/null +++ b/packages/linux/linux-omap/fix-install.patch @@ -0,0 +1,23 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700) +Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70 + +scripts/Makefile.fwinst: add missing space when setting mode in cmd_install + +This was causing build failures on some machines +--- + +diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst +index 6bf8e87..fb20532 100644 +--- a/scripts/Makefile.fwinst ++++ b/scripts/Makefile.fwinst +@@ -37,7 +37,7 @@ install-all-dirs: $(installed-fw-dirs) + @true + + quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) +- cmd_install = $(INSTALL) -m0644 $< $@ ++ cmd_install = $(INSTALL) -m 0644 $< $@ + + $(installed-fw-dirs): + $(call cmd,mkdir) diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index 2de27dafb1..085b2f6be3 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -22,7 +22,8 @@ SRC_URI_append = " file://no-harry-potter.diff;patch=1 \ file://4bitmmc.diff;patch=1 \ file://no-cortex-deadlock.patch;patch=1 \ file://read_die_ids.patch;patch=1 \ - " + file://fix-install.patch;patch=1 \ +" temporarely-disabled = " \ file://01-fix-timing-print.diff;patch=1 \ -- cgit v1.2.3 From f99a8715e849187c05b3bbabd7f45a6b2ca39306 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@openembedded.org> Date: Wed, 10 Sep 2008 12:59:04 +0000 Subject: base-passwd: make 3.5.19 the default, a diff of packages only showed difference in the update-passwd binary, which were bugfixes --- packages/base-passwd/base-passwd_3.5.19.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'packages') diff --git a/packages/base-passwd/base-passwd_3.5.19.bb b/packages/base-passwd/base-passwd_3.5.19.bb index 56b677cf0f..65ee129e0b 100644 --- a/packages/base-passwd/base-passwd_3.5.19.bb +++ b/packages/base-passwd/base-passwd_3.5.19.bb @@ -2,8 +2,6 @@ DESCRIPTION = "Base system password/group files." SECTION = "base" LICENSE = "GPL" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ file://nobash.patch;patch=1 \ file://root-home.patch;patch=1 \ -- cgit v1.2.3 From d7c51596650337b0f51c7a4ac2f6fae52bd01832 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@openembedded.org> Date: Wed, 10 Sep 2008 13:01:50 +0000 Subject: fennec: update hg rev to get new js JIT and tweak mozconfig for arm --- packages/mozilla/fennec/arm/mozconfig | 4 ++++ packages/mozilla/fennec_hg.bb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/mozilla/fennec/arm/mozconfig b/packages/mozilla/fennec/arm/mozconfig index 0e25c7e248..926fa86041 100644 --- a/packages/mozilla/fennec/arm/mozconfig +++ b/packages/mozilla/fennec/arm/mozconfig @@ -4,6 +4,10 @@ mk_add_options AUTOCONF=autoconf2.13 ac_add_options --disable-javaxpcom +ac_add_options --enable-system-cairo +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg + ac_add_app_options xulrunner --with-arm-kuser ac_add_app_options xulrunner --enable-application=xulrunner diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb index cb56c949d0..cd6ccfb1db 100644 --- a/packages/mozilla/fennec_hg.bb +++ b/packages/mozilla/fennec_hg.bb @@ -1,9 +1,9 @@ DEPENDS += "cairo alsa-lib " PV = "0.7" -PR = "r2" +PR = "r4" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7352ef83055a \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=087dfa16ea19 \ hg://hg.mozilla.org/;module=mobile-browser;rev=767c0315369c \ file://jsautocfg.h \ file://jsautocfg-dontoverwrite.patch;patch=1 \ -- cgit v1.2.3