From 782aab41f00a266c6dc530254859aaeec2a92cdc Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 12 Aug 2006 13:23:02 +0000 Subject: slugos-packages: Demoted madwifi-ng - fails to build on nudi --- packages/meta/slugos-packages.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index ec42c59c64..04885f3de4 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -102,7 +102,6 @@ SLUGOS_PACKAGES = "\ lvm2 \ m4 \ madplay \ - madwifi-ng \ mailx \ make \ masqmail \ @@ -179,6 +178,7 @@ SLUGOS_PACKAGES = "\ # Packages currently broken on all platforms SLUGOS_BROKEN_PACKAGES = "\ irssi \ + madwifi-ng \ obexftp \ qc-usb-messenger \ unionfs-modules \ -- cgit v1.2.3 From 20bcdee75725341792ea72eeacec54202dddf4e8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 12 Aug 2006 13:23:30 +0000 Subject: ucslugc: Go back to gcc 3.4.4 until someone gets gcc 4.1.1 to work for ucslugc. --- conf/distro/ucslugc.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 873e047009..81d5ea7397 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -10,6 +10,10 @@ DISTRO_TYPE = "beta" SLUGOS_IMAGENAME = "ucslugc" SLUGOS_IMAGESEX = "big-endian" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc = "3.4.4" + # NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this # directory -- cgit v1.2.3 From b348d71be248a6c92fbeaae30dddcba303221444 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 12 Aug 2006 16:33:26 +0000 Subject: madwifi: removed -mapcs-32 and -malignment-traps from patches. these are not supported for gcc4 and after discussion in #oe it was considered safe to remove them as even on gcc3 they apparently do not have any effect above arm7 --- packages/madwifi/files/10-xscale-be-elf-copts.patch | 10 ++++++---- packages/madwifi/files/10-xscale-le-elf-copts.patch | 6 +++--- packages/madwifi/madwifi-ng_r1692-20060723.bb | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/madwifi/files/10-xscale-be-elf-copts.patch b/packages/madwifi/files/10-xscale-be-elf-copts.patch index e3158c045c..84915e03e2 100644 --- a/packages/madwifi/files/10-xscale-be-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-be-elf-copts.patch @@ -1,8 +1,10 @@ --- madwifi-ng/hal/public/xscale-be-elf.inc~ 2006-02-11 22:34:39.000000000 +1030 +++ madwifi-ng/hal/public/xscale-be-elf.inc 2006-04-12 06:10:47.736463272 +0930 -@@ -73,4 +73,4 @@ +@@ -77,5 +77,5 @@ + LDOPTS= -EB - COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN -DAH_REGOPS_FUNC - COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ + COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN +-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ - -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mtune=xscale -malignment-traps -msoft-float -mfp=2 ++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \ ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/files/10-xscale-le-elf-copts.patch b/packages/madwifi/files/10-xscale-le-elf-copts.patch index 393167c165..7ab46e16b3 100644 --- a/packages/madwifi/files/10-xscale-le-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-le-elf-copts.patch @@ -1,8 +1,8 @@ --- madwifi-ng/hal/public/xscale-le-elf.inc~ 2006-04-12 06:09:56.669226672 +0930 +++ madwifi-ng/hal/public/xscale-le-elf.inc 2006-04-12 05:52:11.658132968 +0930 -@@ -74,4 +74,4 @@ +@@ -79,4 +79,4 @@ LDOPTS= -EL - COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN -DAH_REGOPS_FUNC + COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ - -mapcs-32 -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mapcs-32 -mtune=xscale -malignment-traps -msoft-float -mfp=2 ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb index 84af37257d..6268f2b78f 100644 --- a/packages/madwifi/madwifi-ng_r1692-20060723.bb +++ b/packages/madwifi/madwifi-ng_r1692-20060723.bb @@ -1,2 +1,2 @@ require madwifi-ng_r.inc -PR="r0" +PR="r1" -- cgit v1.2.3 From e77faee11a7145b1d08156ae634e15c0c4578e7b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 12 Aug 2006 17:59:37 +0000 Subject: libmimedir 0.4.0: add patch by Martin Felis to fix list append behaviour --- packages/libmimedir/files/gslist-fix.patch | 11 +++++++++++ packages/libmimedir/libmimedir_0.4.0-20060804.bb | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 packages/libmimedir/files/gslist-fix.patch diff --git a/packages/libmimedir/files/gslist-fix.patch b/packages/libmimedir/files/gslist-fix.patch new file mode 100644 index 0000000000..ef28ecdc53 --- /dev/null +++ b/packages/libmimedir/files/gslist-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/mimedir-attribute.c 2006-08-12 19:55:04.000000000 +0200 ++++ libmimedir/mimedir/mimedir-attribute.c 2006-08-12 19:55:49.938306000 +0200 +@@ -1768,7 +1768,7 @@ + } + break; + case ',': +- g_slist_append (list, g_string_free (string, FALSE)); ++ list = g_slist_append (list, g_string_free (string, FALSE)); + string = g_string_new (""); + break; + case '\r': diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb index 14c1209b2e..f893bccaf2 100644 --- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -3,14 +3,15 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native glib-2.0" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "5" SRCDATE = "20060804" PV = "0.4.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ file://mimedir-update.patch;patch=1 \ - file://mimedir-write-sequence.patch;patch=1;pnum=0" + file://mimedir-write-sequence.patch;patch=1;pnum=0 \ + file://gslist-fix.patch;patch=1" S = "${WORKDIR}/libmimedir" -- cgit v1.2.3 From 7a592f4f620236b2af25aed10b637e09dd4431f0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 12 Aug 2006 18:15:48 +0000 Subject: udev: add mount.blacklist for h2200 and ipaq-pxa270 --- packages/udev/files/h2200/.mtn2git_empty | 0 packages/udev/files/h2200/mount.blacklist | 6 ++++++ packages/udev/files/ipaq-pxa270/.mtn2git_empty | 0 packages/udev/files/ipaq-pxa270/mount.blacklist | 6 ++++++ 4 files changed, 12 insertions(+) create mode 100644 packages/udev/files/h2200/.mtn2git_empty create mode 100644 packages/udev/files/h2200/mount.blacklist create mode 100644 packages/udev/files/ipaq-pxa270/.mtn2git_empty create mode 100644 packages/udev/files/ipaq-pxa270/mount.blacklist diff --git a/packages/udev/files/h2200/.mtn2git_empty b/packages/udev/files/h2200/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/files/h2200/mount.blacklist b/packages/udev/files/h2200/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/h2200/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram \ No newline at end of file diff --git a/packages/udev/files/ipaq-pxa270/.mtn2git_empty b/packages/udev/files/ipaq-pxa270/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/files/ipaq-pxa270/mount.blacklist b/packages/udev/files/ipaq-pxa270/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/ipaq-pxa270/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram \ No newline at end of file -- cgit v1.2.3