diff options
author | Rod Whitby <rod@whitby.id.au> | 2009-04-28 09:32:07 +0930 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2009-04-28 09:32:07 +0930 |
commit | 51733906e1c12fa345a16578b303860b6111f0e6 (patch) | |
tree | a11d2201ec628496c1fbbe318ac2349e2ae30dab | |
parent | 694436f22483c9dab39acbadafbdf315441873e4 (diff) | |
parent | 1b6bdbe0ee7b8cca34d534a9f49fcbc9abd891a9 (diff) |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
28 files changed, 693 insertions, 104 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9e026e44c4..95ee9c6136 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -342,9 +342,9 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output= IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2" IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" +IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz" IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" +IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." diff --git a/conf/checksums.ini b/conf/checksums.ini index 6e680d7cd5..ffc84c666e 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7282,6 +7282,10 @@ sha256=5af6001401a6bc04c075474be5d8aeb2bdb2ca3e509022c2fc55ca7c7f310256 md5=fd0337e89778e2dba74461c555ea8e42 sha256=e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f +[http://downloads.sourceforge.net/genext2fs/genext2fs-1.4.1.tar.gz] +md5=b7b6361bcce2cedff1ae437fadafe53b +sha256=404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc + [http://downloads.sourceforge.net/genext2fs/genext2fs-1.4rc1.tar.gz] md5=664431bf6737df1c265500e1f0b5d40c sha256=e60f88763ee12c02a5c7ade1a58925ef0ab198f9ec6aaf404747dfc29074c7be @@ -18310,9 +18314,9 @@ sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e md5=26f67d99666834cc579094619821d3c8 sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65 -[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2] -md5=05daeda25430fd13bbdb47b3481f7320 -sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2 +[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc3.bz2] +md5=cd69d16ea42bbf20d0a505690be45868 +sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2] md5=d6249654087f0bcafaa860ac573316a4 diff --git a/conf/licenses.conf b/conf/licenses.conf index e81434da8c..01c4747167 100644 --- a/conf/licenses.conf +++ b/conf/licenses.conf @@ -1,4 +1,5 @@ -SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL" +SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 GPLv3 LGPL LGPLv2.1 LGPLv3" +SRC_DISTRIBUTE_LICENSES += "BSD Apache-2.0 QPL AFL" SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic" SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf openssl" SRC_DISTRIBUTE_LICENSES += "Info-ZIP tcp-wrappers" diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index be38858ae9..f58feb686c 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,9 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -IMAGE_FSTYPES += "tar.gz" +MACHINE_KERNEL_PR = "r1" + +IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" # Currently all the orion devices we support use uImage diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 5e4e1ac579..71fea7a508 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -44,32 +44,19 @@ KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" zaurus_make_installkit () { - cd ${DEPLOY_DIR_IMAGE} - rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ - mkdir ${IMAGE_NAME}-installkit/ - - # Get the latest kernel using the ${KERNEL_IMAGETYPE}-<machine>.bin symlink - if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" = "true" ]; then - [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE} - # we need also tgz for mmc or cf cards - cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz - else - cp ${KERNEL_IMAGETYPE}-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE} - fi - - if [ "${MACHINE}" = "spitz" ]; then - cp gnu-tar ${IMAGE_NAME}-installkit/ - cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz - else - [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin - fi - - cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh - + + cd ${DEPLOY_DIR_IMAGE} + rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/ + mkdir installkit-${MACHINE}/ + + [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE} + + cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh - tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/ - md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 - rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ + tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/ + md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5 + rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/ + } require conf/machine/include/kexecboot.inc diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index cc58c4a48b..c3bbca856a 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,7 +1,10 @@ include conf/machine/include/tune-xscale.inc -UBOOT_ENTRYPOINT = "0xA0008000" -UBOOT_LOADADDRESS = "0xA0008000" +UBOOT_ENTRYPOINT_c7x0 = "0xA0008000" +UBOOT_ENTRYPOINT_akita = "0xA1000000" +UBOOT_ENTRYPOINT_spitz = "0xA1000000" + +UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700" diff --git a/conf/machine/sheevaplug.conf b/conf/machine/sheevaplug.conf index ee9ba6cb88..4517312e7a 100644 --- a/conf/machine/sheevaplug.conf +++ b/conf/machine/sheevaplug.conf @@ -3,4 +3,19 @@ MACHINE_EXTRA_RDEPENDS = "u-boot-utils" MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 4096 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 4096" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + require conf/machine/include/kirkwood.inc diff --git a/recipes/cherokee/cherokee_0.98.0.bb b/recipes/cherokee/cherokee_0.98.0.bb index 7a296940e7..a8ebaa8f72 100644 --- a/recipes/cherokee/cherokee_0.98.0.bb +++ b/recipes/cherokee/cherokee_0.98.0.bb @@ -1,5 +1,7 @@ require cherokee.inc +PR = "r1" + SRC_URI = "http://www.cherokee-project.com/download/0.98/${PV}/cherokee-${PV}.tar.gz \ file://cherokee.init " diff --git a/recipes/cherokee/files/cherokee.init b/recipes/cherokee/files/cherokee.init index ea1263aff5..93603b84db 100644 --- a/recipes/cherokee/files/cherokee.init +++ b/recipes/cherokee/files/cherokee.init @@ -12,7 +12,7 @@ test ! -r "$CONFIG" && exit 0 case "$1" in start) echo "Starting $DESC: " - start-stop-daemon --oknodo -S -x $DAEMON -- -b -C $CONFIG + start-stop-daemon --oknodo -S -x $DAEMON -- -d -C $CONFIG ;; stop) diff --git a/recipes/dvbtools/dvb-apps_1.1.1.bb b/recipes/dvbtools/dvb-apps_1.1.1.bb index ebf25d0393..8f3cd3f2ac 100644 --- a/recipes/dvbtools/dvb-apps_1.1.1.bb +++ b/recipes/dvbtools/dvb-apps_1.1.1.bb @@ -19,6 +19,8 @@ PACKAGES += "evtest evtest-dbg \ dvb-zap-data" +TARGET_CC_ARCH += "${LDFLAGS}" + FILES_${PN} = "" FILES_${PN}-dbg = "" FILES_${PN}-doc = "" diff --git a/recipes/genext2fs/genext2fs-1.4.1/volume.patch b/recipes/genext2fs/genext2fs-1.4.1/volume.patch new file mode 100644 index 0000000000..825fc35bea --- /dev/null +++ b/recipes/genext2fs/genext2fs-1.4.1/volume.patch @@ -0,0 +1,153 @@ +--- + genext2fs.c | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +--- genext2fs-1.4.1.orig/genext2fs.c ++++ genext2fs-1.4.1/genext2fs.c +@@ -507,11 +507,13 @@ swab32(uint32 val) + #define utdecl32(x,n) uint32 x[n]; + + typedef struct + { + superblock_decl +- uint32 s_reserved[235]; // Reserved ++ uint32 s_reserved1[9]; ++ char s_volume[16]; ++ uint32 s_reserved2[222]; // Reserved + } superblock; + + typedef struct + { + groupdescriptor_decl +@@ -1219,11 +1221,11 @@ extend_blk(filesystem *fs, uint32 nod, b + lbw = bw; + bw = lbw; + while(create) + { + int i, copyb = 0; +- if(!(fs->sb.s_reserved[200] & OP_HOLES)) ++ if(!(fs->sb.s_reserved2[187] & OP_HOLES)) + copyb = 1; + else + for(i = 0; i < BLOCKSIZE / 4; i++) + if(((int32*)(b + BLOCKSIZE * (amount - create)))[i]) + { +@@ -1891,11 +1893,12 @@ swap_badfs(filesystem *fs) + } + } + + // initialize an empty filesystem + static filesystem * +-init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes, uint32 fs_timestamp) ++init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes, ++ uint32 fs_timestamp, char *volumeid) + { + uint32 i; + filesystem *fs; + directory *d; + uint8 * b; +@@ -1956,10 +1959,13 @@ init_fs(int nbblocks, int nbinodes, int + fs->sb.s_inodes_per_group = nbinodes_per_group; + fs->sb.s_wtime = fs_timestamp; + fs->sb.s_magic = EXT2_MAGIC_NUMBER; + fs->sb.s_lastcheck = fs_timestamp; + ++ if (volumeid != NULL) ++ strncpy(fs->sb.s_volume, volumeid, sizeof(fs->sb.s_volume)); ++ + // set up groupdescriptors + for(i=0, bbmpos=gdsz+2, ibmpos=bbmpos+1, itblpos=ibmpos+1; + i<nbgroups; + i++, bbmpos+=nbblocks_per_group, ibmpos+=nbblocks_per_group, itblpos+=nbblocks_per_group) + { +@@ -2055,11 +2061,11 @@ init_fs(int nbblocks, int nbinodes, int + fs->sb.s_state = 1; + fs->sb.s_max_mnt_count = 20; + + // options for me + if(holes) +- fs->sb.s_reserved[200] |= OP_HOLES; ++ fs->sb.s_reserved2[187] |= OP_HOLES; + + return fs; + } + + // loads a filesystem from disk +@@ -2351,11 +2357,11 @@ print_fs(filesystem *fs) + + static void + dump_fs(filesystem *fs, FILE * fh, int swapit) + { + uint32 nbblocks = fs->sb.s_blocks_count; +- fs->sb.s_reserved[200] = 0; ++ fs->sb.s_reserved2[187] = 0; + if(swapit) + swap_goodfs(fs); + if(fwrite(fs, BLOCKSIZE, nbblocks, fh) < nbblocks) + perror_msg_and_die("output filesystem image"); + if(swapit) +@@ -2465,10 +2471,11 @@ main(int argc, char **argv) + int squash_uids = 0; + int squash_perms = 0; + uint16 endian = 1; + int bigendian = !*(char*)&endian; + filesystem *fs; ++ char *volumeid = NULL; + int i; + int c; + struct stats stats; + + #if HAVE_GETOPT_LONG +@@ -2477,10 +2484,11 @@ main(int argc, char **argv) + { "root", required_argument, NULL, 'd' }, + { "devtable", required_argument, NULL, 'D' }, + { "size-in-blocks", required_argument, NULL, 'b' }, + { "bytes-per-inode", required_argument, NULL, 'i' }, + { "number-of-inodes", required_argument, NULL, 'N' }, ++ { "volume-id", required_argument, NULL, 'L' }, + { "reserved-percentage", required_argument, NULL, 'm' }, + { "block-map", required_argument, NULL, 'g' }, + { "fill-value", required_argument, NULL, 'e' }, + { "allow-holes", no_argument, NULL, 'z' }, + { "faketime", no_argument, NULL, 'f' }, +@@ -2493,11 +2501,11 @@ main(int argc, char **argv) + { 0, 0, 0, 0} + } ; + + app_name = argv[0]; + +- while((c = getopt_long(argc, argv, "x:d:D:b:i:N:m:g:e:zfqUPhVv", longopts, NULL)) != EOF) { ++ while((c = getopt_long(argc, argv, "x:d:D:b:i:N:L:m:g:e:zfqUPhVv", longopts, NULL)) != EOF) { + #else + app_name = argv[0]; + + while((c = getopt(argc, argv, "x:d:D:b:i:N:m:g:e:zfqUPhVv")) != EOF) { + #endif /* HAVE_GETOPT_LONG */ +@@ -2517,10 +2525,13 @@ main(int argc, char **argv) + bytes_per_inode = SI_atof(optarg); + break; + case 'N': + nbinodes = SI_atof(optarg); + break; ++ case 'L': ++ volumeid = optarg; ++ break; + case 'm': + reserved_frac = SI_atof(optarg) / 100; + break; + case 'g': + gopt[gidx++] = optarg; +@@ -2607,11 +2618,12 @@ main(int argc, char **argv) + if(tmp_nbinodes > nbinodes) + nbinodes = tmp_nbinodes; + } + if(fs_timestamp == -1) + fs_timestamp = time(NULL); +- fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, fs_timestamp); ++ fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, ++ fs_timestamp, volumeid); + } + + populate_fs(fs, dopt, didx, squash_uids, squash_perms, fs_timestamp, NULL); + + if(emptyval) { diff --git a/recipes/genext2fs/genext2fs-native_1.4.1.bb b/recipes/genext2fs/genext2fs-native_1.4.1.bb new file mode 100644 index 0000000000..50b371b97e --- /dev/null +++ b/recipes/genext2fs/genext2fs-native_1.4.1.bb @@ -0,0 +1,10 @@ +require genext2fs_${PV}.bb +inherit native + +do_stage () { + install -m 0755 genext2fs ${STAGING_BINDIR}/ +} + +do_install () { + : +} diff --git a/recipes/genext2fs/genext2fs_1.4.1.bb b/recipes/genext2fs/genext2fs_1.4.1.bb new file mode 100644 index 0000000000..10ad9de052 --- /dev/null +++ b/recipes/genext2fs/genext2fs_1.4.1.bb @@ -0,0 +1,9 @@ +require genext2fs.inc + + +SRC_URI = "${SOURCEFORGE_MIRROR}/genext2fs/genext2fs-${PV}.tar.gz \ + file://volume.patch;patch=1" + +DEFAULT_PREFERENCE = "1" + +inherit autotools diff --git a/recipes/gtk+/gtk+_2.8.16.bb b/recipes/gtk+/gtk+_2.8.16.bb index fd25122d5c..8eac914ed6 100644 --- a/recipes/gtk+/gtk+_2.8.16.bb +++ b/recipes/gtk+/gtk+_2.8.16.bb @@ -22,7 +22,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://scroll-timings.patch;patch=1 \ file://small-gtkfilesel.patch;patch=1 \ file://migration.patch;patch=1;pnum=0 \ - file://no-demos.patch;patch=1" \ + file://no-demos.patch;patch=1 \ file://gtk+-handhelds.patch;patch=1 \ file://single-click.patch;patch=1" diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index 94f1ff75ef..01f9871c55 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -1,9 +1,9 @@ #initramfs image which mounts the rootfilesystem and kexecs a kernel from there ONLINE_PACKAGE_MANAGEMENT = "none" -IMAGE_FSTYPES += " cpio.gz" -inherit image +IMAGE_FSTYPES = "cpio.gz" +# Deprecated: device nodes are populated by kexecboot now # These devices need mmcblk* to be 254 instead of 179 IMAGE_DEVICE_TABLES_hx4700 = "device_table-oldmmc.txt" IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" @@ -16,9 +16,11 @@ KEXECBOOT_IMAGEDEPENDS ?= "" EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}" IMAGE_INSTALL = "kexecboot" -IMAGE_LINGUAS = "" +IMAGE_LINGUAS = "" IMAGE_LOGIN_MANAGER = "" IMAGE_INIT_MANAGER = "" IMAGE_INITSCRIPTS = "" IMAGE_DEV_MANAGER = "" + +inherit image diff --git a/recipes/kexecboot/kexecboot-cfg_0.1.bb b/recipes/kexecboot/kexecboot-cfg_0.1.bb index a2145f9bc8..62db7d2ecd 100644 --- a/recipes/kexecboot/kexecboot-cfg_0.1.bb +++ b/recipes/kexecboot/kexecboot-cfg_0.1.bb @@ -21,7 +21,7 @@ FILES_${PN} += "/boot/*" do_install_prepend () { - echo "DEFAULT" > ${S}/boot.cfg + echo "DEFAULT=${DISTRO}" > ${S}/boot.cfg echo "LABEL=${DISTRO}" >> ${S}/boot.cfg echo "KERNEL=/boot/${KERNEL_IMAGETYPE}" >> ${S}/boot.cfg echo "APPEND=${CMDLINE_CON} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" >> ${S}/boot.cfg diff --git a/recipes/linux/linux-kirkwood/defconfig b/recipes/linux/linux-kirkwood/defconfig index 210c2c9e25..078f7efac3 100644 --- a/recipes/linux/linux-kirkwood/defconfig +++ b/recipes/linux/linux-kirkwood/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.29-rc7 -# Sat Mar 21 22:08:30 2009 +# Linux kernel version: 2.6.29.1 +# Mon Apr 27 14:13:52 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -51,12 +51,13 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set # CONFIG_PREEMPT_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 # CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_RELAY is not set +CONFIG_RELAY=y CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_IPC_NS is not set @@ -67,6 +68,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y # CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -77,10 +79,8 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -CONFIG_COMPAT_BRK=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y -CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y @@ -90,6 +90,7 @@ CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set @@ -110,11 +111,11 @@ CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y CONFIG_LBD=y -# CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -181,6 +182,7 @@ CONFIG_MACH_DB88F6281_BP=y CONFIG_MACH_RD88F6192_NAS=y CONFIG_MACH_RD88F6281=y CONFIG_MACH_SHEEVAPLUG=y +# CONFIG_MACH_TS219 is not set CONFIG_PLAT_ORION=y # @@ -250,15 +252,17 @@ CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y CONFIG_UNEVICTABLE_LRU=y CONFIG_ALIGNMENT_TRAP=y +CONFIG_UACCESS_WITH_MEMCPY=y # # Boot options # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Power Management @@ -280,8 +284,8 @@ CONFIG_CMDLINE="" CONFIG_BINFMT_ELF=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y -# CONFIG_BINFMT_AOUT is not set -# CONFIG_BINFMT_MISC is not set +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m # # Power management options @@ -373,6 +377,7 @@ CONFIG_IRDA=m # IrDA protocols # CONFIG_IRLAN=m +# CONFIG_IRNET is not set CONFIG_IRCOMM=m CONFIG_IRDA_ULTRA=y @@ -448,6 +453,7 @@ CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=y +# CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=y # @@ -458,7 +464,7 @@ CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set -# CONFIG_MAC80211_LEDS is not set +CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set @@ -586,7 +592,15 @@ CONFIG_MTD_NAND_ORION=y # # UBI - Unsorted block images # -# CONFIG_MTD_UBI is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_CPQ_DA is not set @@ -595,13 +609,15 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_CRYPTOLOOP=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m # CONFIG_MISC_DEVICES is not set CONFIG_EEPROM_93CX6=m CONFIG_HAVE_IDE=y @@ -610,7 +626,7 @@ CONFIG_HAVE_IDE=y # # SCSI device support # -# CONFIG_RAID_ATTRS is not set +CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set @@ -631,7 +647,7 @@ CONFIG_CHR_DEV_SG=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set @@ -813,6 +829,7 @@ CONFIG_MII=y # CONFIG_ENC28J60 is not set # CONFIG_SMC911X is not set # CONFIG_SMSC911X is not set +# CONFIG_DNET is not set # CONFIG_NET_TULIP is not set # CONFIG_HP100 is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set @@ -861,6 +878,7 @@ CONFIG_NETDEV_1000=y # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set CONFIG_MV643XX_ETH=y +# CONFIG_MV643XX_ETH_LRO is not set # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set @@ -903,9 +921,6 @@ CONFIG_P54_USB=m # CONFIG_HOSTAP is not set # CONFIG_B43 is not set # CONFIG_B43LEGACY is not set -# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_RT2X00=m @@ -928,19 +943,19 @@ CONFIG_RT2X00_LIB_LEDS=y # # USB Network Adapters # -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set -# CONFIG_USB_NET_SMSC95XX is not set +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC95XX=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_MCS7830 is not set +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m # CONFIG_USB_ALI_M5632 is not set @@ -953,8 +968,21 @@ CONFIG_USB_NET_ZAURUS=m # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOL2TP=m +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +CONFIG_SLHC=m +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_NET_FC is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -1623,7 +1651,7 @@ CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_UWB is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # # MMC/SD/SDIO Card Drivers @@ -1638,6 +1666,7 @@ CONFIG_SDIO_UART=y # # CONFIG_MMC_SDHCI is not set # CONFIG_MMC_TIFM_SD is not set +CONFIG_MMC_MVSDIO=y # CONFIG_MMC_SPI is not set # CONFIG_MEMSTICK is not set # CONFIG_ACCESSIBILITY is not set @@ -1836,6 +1865,12 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set CONFIG_CRAMFS=y # CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set @@ -1973,7 +2008,6 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set @@ -2005,6 +2039,7 @@ CONFIG_TRACING=y # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set +CONFIG_ARM_UNWIND=y CONFIG_DEBUG_USER=y CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_STACK_USAGE is not set @@ -2054,7 +2089,7 @@ CONFIG_CRYPTO_MANAGER2=y # # Block modes # -CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CBC=y # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=y @@ -2079,7 +2114,7 @@ CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_SHA1 is not set +CONFIG_CRYPTO_SHA1=m # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set @@ -2107,8 +2142,8 @@ CONFIG_CRYPTO_ARC4=y # # Compression # -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_LZO is not set +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_LZO=y # # Random Number Generation @@ -2131,6 +2166,8 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/recipes/linux/linux-kirkwood_2.6.29-rc7+git.bb b/recipes/linux/linux-kirkwood_2.6.29.1.bb index f870bcef29..531f520497 100644 --- a/recipes/linux/linux-kirkwood_2.6.29-rc7+git.bb +++ b/recipes/linux/linux-kirkwood_2.6.29.1.bb @@ -1,15 +1,17 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" LICENSE = "GPL" -PR = "r0" COMPATIBLE_MACHINE = "sheevaplug" require linux.inc -PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}" +# Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc +PV = "2.6.29.1" +PR_append = "+gitr${SRCREV}" +#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}" -SRCREV = "569106c70e49ad67c69fa7d43a2a5218e63a4619" -SRC_URI = "git://git.marvell.com/orion.git;protocol=git \ +SRCREV = "f66f1d49e6d8617a07b07681c684083e48547eef" +SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \ file://fw.patch;patch=1 \ file://defconfig \ " diff --git a/recipes/linux/linux-rt_2.6.24.bb b/recipes/linux/linux-rt_2.6.24.bb index 0afc5453a5..268567b23a 100644 --- a/recipes/linux/linux-rt_2.6.24.bb +++ b/recipes/linux/linux-rt_2.6.24.bb @@ -5,9 +5,11 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEFAULT_PREFERENCE_mpc8315e-rdb = "1" -PR = "r7" +PR = "r8" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;patch=1;p=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24.7-rt27.bz2;patch=1;p=1 \ file://squashfs-lzma-2.6.24.patch;patch=1 \ file://powerpc-clockres.patch;patch=1 \ file://defconfig" @@ -17,11 +19,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ S = "${WORKDIR}/linux-2.6.24" SRC_URI_append_mpc8313e-rdb = " \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;patch=1;p=1 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24.7-rt11.bz2;patch=1;p=1 \ file://leds-cpu-activity.patch;patch=1 \ file://leds-cpu-activity-powerpc.patch;patch=1 \ - file://mpc8313e-rdb-leds.patch;patch=1" + file://mpc8313e-rdb-leds.patch;patch=1" # file://mpc831x-nand.patch;patch=1 \ # file://mpc8313e-rdb-rtc.patch;patch=1 " @@ -32,11 +32,14 @@ KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb_default.dts" # Patch series taken from MPC8315ERDB_20080627-ltib.iso, available as-is from # Freescale's web site. Patches also available at www.bitshrine.org, which I -# use here. -- Leon Woestenberg +# use here. -- Leon Woestenberg <leon@sidebranch.com> -SRC_URI_append_mpc8315e-rdb = " \ +SRC_URI_mpc8315e-rdb = " \ +${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.3.bz2;patch=1;p=1 \ ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-2.6.24.3-rt3.bz2;patch=1;p=1 \ +file://squashfs-lzma-2.6.24.patch;patch=1 \ +file://powerpc-clockres.patch;patch=1 \ http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-platform-support.patch;patch=1 \ http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-add-all-interrupts.patch;patch=1 \ http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Realtek-821x-phy.patch;patch=1 \ diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc1.bb b/recipes/linux/linux_2.6.29+2.6.30-rc3.bb index 96871e733b..bd0680707c 100644 --- a/recipes/linux/linux_2.6.29+2.6.30-rc1.bb +++ b/recipes/linux/linux_2.6.29+2.6.30-rc3.bb @@ -1,6 +1,6 @@ require linux.inc -KERNEL_RELEASE = "2.6.30-rc1" +KERNEL_RELEASE = "2.6.30-rc3" OLD_KERNEL_RELEASE = "2.6.29" PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}" PR = "r1" diff --git a/recipes/ltp/ltp-20090131/syscalls.patch b/recipes/ltp/ltp-20090131/syscalls.patch new file mode 100644 index 0000000000..34cead1f19 --- /dev/null +++ b/recipes/ltp/ltp-20090131/syscalls.patch @@ -0,0 +1,317 @@ +--- ltp-full-20090131.orig/testcases/kernel/include/i386.in 2008-11-25 23:02:31.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/include/i386.in 2009-02-04 09:49:26.000000000 +0900 +@@ -40,3 +40,9 @@ __NR_eventfd 323 + __NR_fallocate 324 + __NR_timerfd_settime 325 + __NR_timerfd_gettime 326 ++__NR_signalfd4 327 ++__NR_eventfd2 328 ++__NR_epoll_create2 329 ++__NR_dup3 330 ++__NR_pipe2 331 ++__NR_inotify_init1 332 +--- ltp-full-20090131.orig/testcases/kernel/include/regen.sh 2008-11-13 04:18:27.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/include/regen.sh 2009-02-04 10:05:46.000000000 +0900 +@@ -20,6 +20,7 @@ cat << EOF > ${output} + #ifndef __LINUX_SYSCALL_NUMBERS_H__ + #define __LINUX_SYSCALL_NUMBERS_H__ + ++#include <errno.h> + #include <sys/syscall.h> + + static void cleanup(void); +--- ltp-full-20090131.orig/testcases/kernel/include/x86_64.in 2008-11-19 19:34:37.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/include/x86_64.in 2009-02-04 09:49:26.000000000 +0900 +@@ -27,3 +27,9 @@ __NR_eventfd 284 + __NR_fallocate 285 + __NR_timerfd_settime 286 + __NR_timerfd_gettime 287 ++__NR_signalfd4 289 ++__NR_eventfd2 290 ++__NR_epoll_create2 291 ++__NR_dup3 292 ++__NR_pipe2 293 ++__NR_inotify_init1 294 +--- ltp-full-20090131.orig/testcases/kernel/syscalls/dup3/dup3_01.c 2009-01-16 19:16:53.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/dup3/dup3_01.c 2009-02-04 10:45:38.000000000 +0900 +@@ -60,21 +60,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_dup3 +-# ifdef __x86_64__ +-# define __NR_dup3 292 +-# elif defined __i386__ +-# define __NR_dup3 330 +-# else +-# error "need __NR_dup3" +-# endif +-#endif +- + /* Extern Global Variables */ + extern int Tst_count; /* counter for tst_xxx routines. */ + extern char *TESTDIR; /* temporary dir created by tst_tmpdir() */ +--- ltp-full-20090131.orig/testcases/kernel/syscalls/epoll_create2/epoll_create2_01.c 2009-01-16 19:14:35.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/epoll_create2/epoll_create2_01.c 2009-02-04 10:45:52.000000000 +0900 +@@ -62,16 +62,7 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" +- +-#ifndef __NR_epoll_create2 +-# ifdef __x86_64__ +-# define __NR_epoll_create2 291 +-# elif defined __i386__ +-# define __NR_epoll_create2 329 +-# else +-# error "need __NR_epoll_create2" +-# endif +-#endif ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 +--- ltp-full-20090131.orig/testcases/kernel/syscalls/eventfd2/eventfd2_01.c 2009-01-16 19:10:17.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/eventfd2/eventfd2_01.c 2009-02-04 10:46:08.000000000 +0900 +@@ -61,21 +61,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_eventfd2 +-# ifdef __x86_64__ +-# define __NR_eventfd2 290 +-# elif defined __i386__ +-# define __NR_eventfd2 328 +-# else +-# error "need __NR_eventfd2" +-# endif +-#endif +- + #define EFD_CLOEXEC O_CLOEXEC + + /* Extern Global Variables */ +--- ltp-full-20090131.orig/testcases/kernel/syscalls/eventfd2/eventfd2_02.c 2009-01-16 19:31:43.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/eventfd2/eventfd2_02.c 2009-02-04 10:46:19.000000000 +0900 +@@ -58,21 +58,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_eventfd2 +-# ifdef __x86_64__ +-# define __NR_eventfd2 290 +-# elif defined __i386__ +-# define __NR_eventfd2 328 +-# else +-# error "need __NR_eventfd2" +-# endif +-#endif +- + #define EFD_NONBLOCK O_NONBLOCK + + /* Extern Global Variables */ +--- ltp-full-20090131.orig/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c 2009-01-16 19:21:40.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c 2009-02-04 10:46:28.000000000 +0900 +@@ -61,20 +61,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_inotify_init1 +-# ifdef __x86_64__ +-# define __NR_inotify_init1 294 +-# elif defined __i386__ +-# define __NR_inotify_init1 332 +-# else +-# error "need __NR_inotify_init1" +-# endif +-#endif + #define IN_CLOEXEC O_CLOEXEC + + /* Extern Global Variables */ +--- ltp-full-20090131.orig/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c 2009-01-16 19:36:22.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c 2009-02-04 10:46:39.000000000 +0900 +@@ -58,21 +58,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_inotify_init1 +-# ifdef __x86_64__ +-# define __NR_inotify_init1 294 +-# elif defined __i386__ +-# define __NR_inotify_init1 332 +-# else +-# error "need __NR_inotify_init1" +-# endif +-#endif +- + #define IN_NONBLOCK O_NONBLOCK + + /* Extern Global Variables */ +--- ltp-full-20090131.orig/testcases/kernel/syscalls/pipe2/pipe2_01.c 2009-01-16 19:18:58.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/pipe2/pipe2_01.c 2009-02-04 10:46:48.000000000 +0900 +@@ -69,21 +69,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_pipe2 +-# ifdef __x86_64__ +-# define __NR_pipe2 293 +-# elif defined __i386__ +-# define __NR_pipe2 331 +-# else +-# error "need __NR_pipe2" +-# endif +-#endif +- + /* Extern Global Variables */ + extern int Tst_count; /* counter for tst_xxx routines. */ + extern char *TESTDIR; /* temporary dir created by tst_tmpdir() */ +--- ltp-full-20090131.orig/testcases/kernel/syscalls/pipe2/pipe2_02.c 2009-01-16 19:34:52.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/pipe2/pipe2_02.c 2009-02-04 10:46:58.000000000 +0900 +@@ -60,21 +60,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_pipe2 +-# ifdef __x86_64__ +-# define __NR_pipe2 293 +-# elif defined __i386__ +-# define __NR_pipe2 331 +-# else +-# error "need __NR_pipe2" +-# endif +-#endif +- + /* Extern Global Variables */ + extern int Tst_count; /* counter for tst_xxx routines. */ + extern char *TESTDIR; /* temporary dir created by tst_tmpdir() */ +--- ltp-full-20090131.orig/testcases/kernel/syscalls/signalfd4/signalfd4_01.c 2009-01-16 19:07:56.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/signalfd4/signalfd4_01.c 2009-02-04 10:47:08.000000000 +0900 +@@ -63,20 +63,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_signalfd4 +-# ifdef __x86_64__ +-# define __NR_signalfd4 289 +-# elif defined __i386__ +-# define __NR_signalfd4 327 +-# else +-# error "need __NR_signalfd4" +-# endif +-#endif + #define SFD_CLOEXEC O_CLOEXEC + + /* Extern Global Variables */ +--- ltp-full-20090131.orig/testcases/kernel/syscalls/signalfd4/signalfd4_02.c 2009-01-16 19:29:50.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/signalfd4/signalfd4_02.c 2009-02-04 10:47:19.000000000 +0900 +@@ -59,16 +59,7 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" +- +-#ifndef __NR_signalfd4 +-# ifdef __x86_64__ +-# define __NR_signalfd4 289 +-# elif defined __i386__ +-# define __NR_signalfd4 327 +-# else +-# error "need __NR_signalfd4" +-# endif +-#endif ++#include "linux_syscall_numbers.h" + + #define SFD_NONBLOCK O_NONBLOCK + +--- ltp-full-20090131.orig/testcases/kernel/syscalls/timerfd/timerfd02.c 2009-01-16 19:12:03.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/timerfd/timerfd02.c 2009-02-04 10:47:29.000000000 +0900 +@@ -63,16 +63,7 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" +- +-#ifndef __NR_timerfd_create +-# ifdef __x86_64__ +-# define __NR_timerfd_create 283 +-# elif defined __i386__ +-# define __NR_timerfd_create 322 +-# else +-# error "need __NR_timerfd_create" +-# endif +-#endif ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 +--- ltp-full-20090131.orig/testcases/kernel/syscalls/timerfd/timerfd03.c 2009-01-16 19:33:26.000000000 +0900 ++++ ltp-full-20090131.modified/testcases/kernel/syscalls/timerfd/timerfd03.c 2009-02-04 10:47:40.000000000 +0900 +@@ -59,21 +59,12 @@ + /* Harness Specific Include Files. */ + #include "test.h" + #include "usctest.h" ++#include "linux_syscall_numbers.h" + + #ifndef O_CLOEXEC + # define O_CLOEXEC 02000000 + #endif + +-#ifndef __NR_timerfd_create +-# ifdef __x86_64__ +-# define __NR_timerfd_create 283 +-# elif defined __i386__ +-# define __NR_timerfd_create 322 +-# else +-# error "need __NR_timerfd_create" +-# endif +-#endif +- + #define TFD_NONBLOCK O_NONBLOCK + + /* Extern Global Variables */ diff --git a/recipes/ltp/ltp_20090131.bb b/recipes/ltp/ltp_20090131.bb index 4793d24e27..1a661fbd71 100644 --- a/recipes/ltp/ltp_20090131.bb +++ b/recipes/ltp/ltp_20090131.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://ltp.sourceforge.net" LICENSE = "GPL" SECTION = "console/utils" DEPENDS = "zip-native" -PR = "r3" +PR = "r4" inherit autotools @@ -12,7 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \ file://runltp-path.patch;patch=1 \ file://fix-tcore_patch_test_suites.patch;patch=1 \ file://no-IDcheck.patch;patch=1 \ - file://no_hyperthreading_tests.patch;patch=1" + file://no_hyperthreading_tests.patch;patch=1 \ + file://syscalls.patch;patch=1" SRC_URI_append_mips += "file://no_epoll_create2.patch;patch=1" SRC_URI_append_mipsel += "file://no_epoll_create2.patch;patch=1" diff --git a/recipes/madwifi/files/respect-ldflags.patch b/recipes/madwifi/files/respect-ldflags.patch new file mode 100644 index 0000000000..1e5e360fae --- /dev/null +++ b/recipes/madwifi/files/respect-ldflags.patch @@ -0,0 +1,39 @@ +Index: madwifi-trunk-r3837-20080802/Makefile +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/Makefile 2009-04-27 00:34:19.000000000 +0200 ++++ madwifi-trunk-r3837-20080802/Makefile 2009-04-27 00:34:31.000000000 +0200 +@@ -61,7 +61,7 @@ + $(MAKE) -C $$i || exit 1; \ + done + else +- $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules ++ $(MAKE) -C $(KERNELPATH) LDFLAGS= SUBDIRS=$(shell pwd) modules + endif + + $(addprefix $(obj)/, $(obj-y:/=)): $(TOP)/svnversion.h +Index: madwifi-trunk-r3837-20080802/tools/Makefile +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/tools/Makefile 2009-04-27 00:34:19.000000000 +0200 ++++ madwifi-trunk-r3837-20080802/tools/Makefile 2009-04-27 00:34:36.000000000 +0200 +@@ -55,7 +55,7 @@ + INCS = -I. -I$(HAL) -I$(TOP) -I$(ATH_HAL) + CFLAGS = -g -O2 -Wall + ALL_CFLAGS = $(CFLAGS) $(INCS) +-LDFLAGS = ++#LDFLAGS = + + all: all-subdirs $(PROGRAMS) + +Index: madwifi-trunk-r3837-20080802/tools/ath_info/Makefile +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/tools/ath_info/Makefile 2009-04-27 00:34:19.000000000 +0200 ++++ madwifi-trunk-r3837-20080802/tools/ath_info/Makefile 2009-04-27 00:34:40.000000000 +0200 +@@ -5,7 +5,7 @@ + USER_CROSS_COMPILE ?= $(CROSS_COMPILE) + CC = $(USER_CROSS_COMPILE)gcc + CFLAGS = -g -O2 -W -Wall +-LDFLAGS = ++#LDFLAGS = + PREFIX = /usr/local + BINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/share/man diff --git a/recipes/madwifi/madwifi-ng_r.inc b/recipes/madwifi/madwifi-ng_r.inc index 8fc3065eb9..2161486f7a 100644 --- a/recipes/madwifi/madwifi-ng_r.inc +++ b/recipes/madwifi/madwifi-ng_r.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -PR ="r5" +PR ="r6" WACKELF_SRC_URI = "" WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1" @@ -12,28 +12,28 @@ WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch;patch=1" SRCNAME = "${PN}" SRC_URI = "http://snapshots.madwifi.org/madwifi-trunk/${SRCNAME}-${PV}.tar.gz \ - file://10-xscale-be-elf-copts.patch;patch=1 \ - file://10-xscale-le-elf-copts.patch;patch=1 \ + file://10-xscale-be-elf-copts.patch;patch=1 \ + file://10-xscale-le-elf-copts.patch;patch=1 \ file://10-sh4-le-elf-copts.patch;patch=1 \ - ${WACKELF_SRC_URI}" + ${WACKELF_SRC_URI}" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit module-base -ARCH_efika="powerpc" ARCH_dht-walnut="ppc" +ARCH_efika="powerpc" ARCH_magicbox="ppc" +ARCH_mpc8313e-rdb="powerpc" +ARCH_mpc8315e-rdb="powerpc" ARCH_sequoia="ppc" -EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" +EXTRA_OEMAKE = "KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" EXTRA_OEMAKE_prepend_ixp4xxle = "TARGET=xscale-le-elf " EXTRA_OEMAKE_prepend_ixp4xxbe = "TARGET=xscale-be-elf " - do_compile() { - unset LDFLAGS oe_runmake all } @@ -61,3 +61,4 @@ fi PACKAGES += "${PN}-modules ${PN}-tools" FILES_${PN}-modules = "/lib/modules/" FILES_${PN}-tools = "/usr/" + diff --git a/recipes/madwifi/madwifi-ng_r3837-20080802.bb b/recipes/madwifi/madwifi-ng_r3837-20080802.bb index bf14c33f83..d79ff3cb9f 100644 --- a/recipes/madwifi/madwifi-ng_r3837-20080802.bb +++ b/recipes/madwifi/madwifi-ng_r3837-20080802.bb @@ -12,7 +12,9 @@ require madwifi-ng_r.inc WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf-v2.patch;patch=1" WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;patch=1" +SRC_URI += "file://respect-ldflags.patch;patch=1" + SRCNAME = "madwifi-trunk" # PR set after the include, to override what's set in the included file. -PR = "r1" +PR = "r2" diff --git a/recipes/qt4/qt4-embedded_4.5.1.bb b/recipes/qt4/qt4-embedded_4.5.1.bb index 5da55f9c1c..3ec4b9aeb5 100644 --- a/recipes/qt4/qt4-embedded_4.5.1.bb +++ b/recipes/qt4/qt4-embedded_4.5.1.bb @@ -4,7 +4,6 @@ LICENSE = "GPL LGPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "tslib" -DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ file://0001-cross-compile.patch;patch=1 \ diff --git a/recipes/qt4/qt4-tools-native_4.5.1.bb b/recipes/qt4/qt4-tools-native_4.5.1.bb index ab633149ba..adb341d465 100644 --- a/recipes/qt4/qt4-tools-native_4.5.1.bb +++ b/recipes/qt4/qt4-tools-native_4.5.1.bb @@ -1,5 +1,4 @@ require qt4-tools-native.inc PR = "r1" -DEFAULT_PREFERENCE = "-1" TOBUILD := "src/tools/bootstrap ${TOBUILD}" diff --git a/recipes/qt4/qt4-x11-free_4.5.1.bb b/recipes/qt4/qt4-x11-free_4.5.1.bb index 0ffbbc2e09..af3a7c702c 100644 --- a/recipes/qt4/qt4-x11-free_4.5.1.bb +++ b/recipes/qt4/qt4-x11-free_4.5.1.bb @@ -5,7 +5,6 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL LGPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ |