diff options
-rw-r--r-- | classes/insane.bbclass | 1 | ||||
-rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
-rw-r--r-- | packages/gift/gift_0.11.5.bb | 4 | ||||
-rw-r--r-- | packages/gmp/gmp-4.2.1/x86-fat.diff | 122 | ||||
-rw-r--r-- | packages/gmp/gmp_4.2.1.bb | 9 | ||||
-rw-r--r-- | packages/jpeg/jpeg-6b/libtool.patch | 49 | ||||
-rw-r--r-- | packages/jpeg/jpeg_6b.bb | 9 | ||||
-rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.20/series | 5 | ||||
-rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.20.bb | 3 | ||||
-rw-r--r-- | packages/madwifi/madwifi-ng_r2187-20070309.bb | 3 | ||||
-rw-r--r-- | packages/perl/perl-5.8.7/config.sh-powerpc-linux | 2 | ||||
-rw-r--r-- | packages/radvd/radvd.inc | 11 | ||||
-rw-r--r-- | packages/radvd/radvd_0.7.2.bb | 14 | ||||
-rw-r--r-- | packages/radvd/radvd_1.0.bb | 5 | ||||
-rw-r--r-- | site/powerpc-linux | 4 |
15 files changed, 218 insertions, 25 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 40f6151f08..1f20fa6614 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -48,6 +48,7 @@ def package_qa_get_machine_dict(): "m68k": ( 4, 0, 0, False, True), "mips": ( 8, 0, 0, False, True), "s390": (22, 0, 0, False, True), + "sh4": (42, 0, 0, True, True), "sparc": ( 2, 0, 0, False, True), }, "linux-uclibc" : { diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 3edaa342cb..8bb143dbba 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.3" +SLUGOS_VERSION = "4.4" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/packages/gift/gift_0.11.5.bb b/packages/gift/gift_0.11.5.bb index 6446398311..a2a1e45bab 100644 --- a/packages/gift/gift_0.11.5.bb +++ b/packages/gift/gift_0.11.5.bb @@ -4,6 +4,10 @@ DEPENDS = "libvorbis libogg" DESCRIPTION = "giFT is a framework for bridging multiple \ backend peer-to-peer protocols and the user interface \ associated with them." +PR="r1" + +DEPENDS=libtool + FILES_gift_append = " ${datadir}/giFT" SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2" diff --git a/packages/gmp/gmp-4.2.1/x86-fat.diff b/packages/gmp/gmp-4.2.1/x86-fat.diff new file mode 100644 index 0000000000..2a54622a26 --- /dev/null +++ b/packages/gmp/gmp-4.2.1/x86-fat.diff @@ -0,0 +1,122 @@ +See: + + http://gmplib.org/patches/x86-fat.diff + http://gmplib.org/list-archives/gmp-bugs/2006-October/000579.html + http://gmplib.org/#BUGREPORTS + +Removed the configure part of the patch since we patch configure.in. It was +only needed for FAT binaries anyway and this is being included to fix +linking errors. + +Index: mpn/generic/addsub_n.c +=================================================================== +RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -p -2 -r1.1 -r1.2 +*** mpn/generic/addsub_n.c 14 Mar 2006 15:57:54 -0000 1.1 +--- mpn/generic/addsub_n.c 15 May 2006 22:38:42 -0000 1.2 +*************** +*** 1,5 **** + /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length. + +! Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. +--- 1,5 ---- + /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length. + +! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 59,63 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +--- 59,63 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 65,69 **** + acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 65,69 ---- + acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 82,86 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 82,86 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 88,92 **** + scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo); + #endif +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +--- 88,92 ---- + scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo); + #endif +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 98,102 **** + else + { +! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa) + Need temporary storage. */ + mp_limb_t tp[PART_SIZE]; +--- 98,102 ---- + else + { +! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa) + Need temporary storage. */ + mp_limb_t tp[PART_SIZE]; +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 106,110 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo); + #else +--- 106,110 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 112,116 **** + acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 112,116 ---- + acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else diff --git a/packages/gmp/gmp_4.2.1.bb b/packages/gmp/gmp_4.2.1.bb index 8ad8e29ad1..452553beda 100644 --- a/packages/gmp/gmp_4.2.1.bb +++ b/packages/gmp/gmp_4.2.1.bb @@ -1,9 +1,6 @@ -PR = "r1" +PR = "r2" -SRC_URI += "file://sh4-asmfix.patch;patch=1" +SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \ + file://x86-fat.diff;patch=1;pnum=0 " require gmp.inc - -# Builds on sh but can't be used due to not compiling in some functions -DEFAULT_PREFERENCE_sh3 = "-1" -DEFAULT_PREFERENCE_sh4 = "-1" diff --git a/packages/jpeg/jpeg-6b/libtool.patch b/packages/jpeg/jpeg-6b/libtool.patch new file mode 100644 index 0000000000..c7fd858cfc --- /dev/null +++ b/packages/jpeg/jpeg-6b/libtool.patch @@ -0,0 +1,49 @@ +--- /orig-makefile.cfg 2007-03-13 18:09:05.000000000 +0200 ++++ /makefile.cfg 2007-03-13 21:42:33.000000000 +0200 +@@ -36,8 +36,10 @@ + # To link any special libraries, add the necessary -l commands here. + LDLIBS= @LIBS@ + ++ + # If using GNU libtool, LIBTOOL references it; if not, LIBTOOL is empty. + LIBTOOL = @LIBTOOL@ ++ + # $(O) expands to "lo" if using libtool, plain "o" if not. + # Similarly, $(A) expands to "la" or "a". + O = @O@ +@@ -55,7 +57,7 @@ + # miscellaneous OS-dependent stuff + SHELL= /bin/sh + # linker +-LN= @LN@ ++LN= $(LIBTOOL) --tag=CC --mode=link $(CC) + # file deletion command + RM= rm -f + # directory creation command +@@ -141,7 +143,7 @@ + + # How to compile with libtool. + @COM_LT@.c.lo: +-@COM_LT@ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/$*.c ++@COM_LT@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/$*.c + + # How to use ansi2knr, when not using libtool. + @COM_A2K@.c.o: +@@ -152,7 +154,7 @@ + # How to use ansi2knr AND libtool. + @COM_A2K@.c.lo: + @COM_A2K@ ./ansi2knr $(srcdir)/$*.c knr/$*.c +-@COM_A2K@ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c knr/$*.c ++@COM_A2K@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -c knr/$*.c + @COM_A2K@ $(RM) knr/$*.c + + ansi2knr: ansi2knr.c +@@ -169,7 +171,7 @@ + + # with libtool: + libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS) +- $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \ ++ $(LIBTOOL) --tag=CC --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \ + -rpath $(libdir) -version-info $(JPEG_LIB_VERSION) $(LDFLAGS) + + # sample programs: diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb index 8573789230..c93aadb6ab 100644 --- a/packages/jpeg/jpeg_6b.bb +++ b/packages/jpeg/jpeg_6b.bb @@ -7,12 +7,15 @@ DEPENDS = "libtool-cross" RPROVIDES_${PN} = "jpeg" -PR = "r6" +PR = "r7" SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ file://debian.patch;patch=1 \ file://ldflags.patch;patch=1 \ - file://paths.patch;patch=1" + file://paths.patch;patch=1 \ + file://libtool.patch;patch=1 \ + " + S = "${WORKDIR}/jpeg-${PV}" inherit autotools @@ -20,7 +23,7 @@ inherit autotools EXTRA_OECONF="--enable-static --enable-shared" EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"' -CFLAGS_append = " -D_REENTRANT" +CFLAGS_append = " -D_REENTRANT" do_stage() { install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series index 6ceb7622ac..4b67723257 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/series +++ b/packages/linux/ixp4xx-kernel/2.6.20/series @@ -9,10 +9,7 @@ squashfs/squashfs-force-O2.patch squashfs/squashfs-lzma.patch squashfs/squashfs-Kconfig.patch squashfs/squashfs-Makefile.patch -00-linux-2.6.20.1.patch -01-fix-redboot-parse-oops.patch -02-fix-redboot-parse-regression.patch -03-improve-byteswap-redboot-parse.patch +00-linux-2.6.20.2.patch 07-remove-avila-ixdp425-setup.patch 08-avila-loft-setup.patch 09-avila-setup-pata.patch diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 667704ae8a..4ddf2c52dd 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -16,10 +16,9 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20" # the changes in SVN between revisions include changes in the # patches applied to the kernel, rather than simply defconfig # changes -PR = "r3.${IXP4XX_KERNEL_SVN_REV}" +PR = "r4.${IXP4XX_KERNEL_SVN_REV}" require ixp4xx-kernel.inc require ixp4xx-kernel-svnpatch.inc SRC_URI += "file://defconfig" -SRC_URI += "file://series" diff --git a/packages/madwifi/madwifi-ng_r2187-20070309.bb b/packages/madwifi/madwifi-ng_r2187-20070309.bb new file mode 100644 index 0000000000..42d8ccafe4 --- /dev/null +++ b/packages/madwifi/madwifi-ng_r2187-20070309.bb @@ -0,0 +1,3 @@ +PR = "r0" + +require madwifi-ng_r.inc diff --git a/packages/perl/perl-5.8.7/config.sh-powerpc-linux b/packages/perl/perl-5.8.7/config.sh-powerpc-linux index 0ca31c1230..6d41d29e9f 100644 --- a/packages/perl/perl-5.8.7/config.sh-powerpc-linux +++ b/packages/perl/perl-5.8.7/config.sh-powerpc-linux @@ -971,7 +971,7 @@ useperlio='define' useposix='true' usereentrant='undef' usesfio='false' -useshrplib='fasle' +useshrplib='false' usesitecustomize='undef' usesocks='undef' usethreads='undef' diff --git a/packages/radvd/radvd.inc b/packages/radvd/radvd.inc new file mode 100644 index 0000000000..745b37d35e --- /dev/null +++ b/packages/radvd/radvd.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "IPv6 router advertisement daemon" +HOMEPAGE = "http://www.litech.org/radvd/" +SECTION = "console/network" +LICENSE = "BSD" +DEPENDS = "flex-native" + +SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz;md5sum=${MD5SUM}" + +S = "${WORKDIR}/radvd-${PV}" + +inherit autotools diff --git a/packages/radvd/radvd_0.7.2.bb b/packages/radvd/radvd_0.7.2.bb index f11e81c7d3..6f22484b05 100644 --- a/packages/radvd/radvd_0.7.2.bb +++ b/packages/radvd/radvd_0.7.2.bb @@ -1,9 +1,7 @@ -SECTION = "console/network" -DESCRIPTION = "IPv6 router advertisement daemon" -LICENSE = "BSD" -SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ - file://automake.patch;patch=1" -S = "${WORKDIR}/radvd-${PV}" -DEPENDS = "flex" +PR = "r1" -inherit autotools +SRC_URI_append += "file://automake.patch;patch=1 " + +require radvd.inc + +MD5SUM = "26ea468b2323e44cf827ae5f84d18dc8" diff --git a/packages/radvd/radvd_1.0.bb b/packages/radvd/radvd_1.0.bb new file mode 100644 index 0000000000..87422a2df9 --- /dev/null +++ b/packages/radvd/radvd_1.0.bb @@ -0,0 +1,5 @@ +PR = "r0" + +require radvd.inc + +MD5SUM = "8bce4a21757cf069f5a69e2f9bee9e5b" diff --git a/site/powerpc-linux b/site/powerpc-linux index b946ca9e1e..dd2c811706 100644 --- a/site/powerpc-linux +++ b/site/powerpc-linux @@ -328,3 +328,7 @@ ac_cv_sync_with_stdio_2=${ac_cv_sync_with_stdio_2=yes} mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} + +# sudo +sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10} + |