diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-08-12 22:39:21 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-08-12 22:39:21 +0000 |
| commit | 7ac305d7bf4f0cae2c8486470165598b402d9002 (patch) | |
| tree | 4af4c6cbc305df321ec926358f182a036894445a | |
| parent | 7a592f4f620236b2af25aed10b637e09dd4431f0 (diff) | |
| parent | 6c6bf818df3770d5fbe1f10432339d6f841148c5 (diff) | |
merge of '9e98fb14bc16730c2bbc97c1720259cb479ac8fa'
and 'b63cff7dc0ce768b721311fb1eca7e9ef45e7ed9'
| -rw-r--r-- | conf/distro/ucslugc.conf | 4 | ||||
| -rw-r--r-- | packages/madwifi/files/10-xscale-be-elf-copts.patch | 10 | ||||
| -rw-r--r-- | packages/madwifi/files/10-xscale-le-elf-copts.patch | 6 | ||||
| -rw-r--r-- | packages/madwifi/madwifi-ng_r1692-20060723.bb | 2 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 2 |
5 files changed, 15 insertions, 9 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/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 \ |