summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/ucslugc.conf4
-rw-r--r--packages/libmimedir/files/gslist-fix.patch11
-rw-r--r--packages/libmimedir/libmimedir_0.4.0-20060804.bb5
-rw-r--r--packages/madwifi/files/10-xscale-be-elf-copts.patch10
-rw-r--r--packages/madwifi/files/10-xscale-le-elf-copts.patch6
-rw-r--r--packages/madwifi/madwifi-ng_r1692-20060723.bb2
-rw-r--r--packages/meta/slugos-packages.bb2
-rw-r--r--packages/udev/files/h2200/.mtn2git_empty0
-rw-r--r--packages/udev/files/h2200/mount.blacklist6
-rw-r--r--packages/udev/files/ipaq-pxa270/.mtn2git_empty0
-rw-r--r--packages/udev/files/ipaq-pxa270/mount.blacklist6
11 files changed, 41 insertions, 11 deletions
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
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"
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"
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 \
diff --git a/packages/udev/files/h2200/.mtn2git_empty b/packages/udev/files/h2200/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/h2200/.mtn2git_empty
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
--- /dev/null
+++ b/packages/udev/files/ipaq-pxa270/.mtn2git_empty
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 05:05:03 +0000