[oe-commits] org.oe.dev merge of '443963b30a3454b1cbac2e120b194068e2b75487'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:38:30 UTC 2007
merge of '443963b30a3454b1cbac2e120b194068e2b75487'
and 'f85eaa89c131e8c92b6c5fadc0215e08dd9e2e9e'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: ce51dc8783e9adee55b781e9cdd39cd5e587383f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ce51dc8783e9adee55b781e9cdd39cd5e587383f
Files:
1
packages/clucene
packages/nonworking/clucene
packages/linux/ixp4xx-kernel_2.6.21.bb
packages/linux/ixp4xx-kernel_2.6.21.1.bb
conf/checksums.ini
conf/distro/include/slugos.inc
packages/aiostress/aiostress_0.0.bb
packages/hdparm/hdparm-6.9/uclibc.patch
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro
Diffs:
#
# mt diff -r443963b30a3454b1cbac2e120b194068e2b75487 -rce51dc8783e9adee55b781e9cdd39cd5e587383f
#
#
# no changes
#
#
# mt diff -rf85eaa89c131e8c92b6c5fadc0215e08dd9e2e9e -rce51dc8783e9adee55b781e9cdd39cd5e587383f
#
#
#
# rename "packages/clucene"
# to "packages/nonworking/clucene"
#
# rename "packages/linux/ixp4xx-kernel_2.6.21.bb"
# to "packages/linux/ixp4xx-kernel_2.6.21.1.bb"
#
# patch "conf/checksums.ini"
# from [433552e2a721db8f9a76e79dab97e5b4b7d8086a]
# to [7baa470a5270fde2a46d8d08c5cfaf8a37088211]
#
# patch "conf/distro/include/slugos.inc"
# from [47d957509a4544befa6f680d588017bfde7d0782]
# to [4105c50380f9423e8f6ed3e2a3621f5d19cec855]
#
# patch "packages/aiostress/aiostress_0.0.bb"
# from [23c25f3ecebe631b96b86efb89f20c3e9c5340bc]
# to [40b69a46236237b807685002fe611632ac9373b1]
#
# patch "packages/hdparm/hdparm-6.9/uclibc.patch"
# from [475f45ee6bbdda84be64887ef6ccac075bb0c0d1]
# to [d4ad8872c7bae0d84fe81e207e0831a44adb0496]
#
# patch "packages/linux/ixp4xx-kernel/2.6.21/defconfig"
# from [03dc5844da1a0da465404476fd256defb757fab1]
# to [1e00d753e5ad2c0fb0f3c0a080c4b744b897d2d1]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.1.bb"
# from [fd002140097d8c025bb6c4ea695d59efcd1c7ee1]
# to [f305d59949bc465d1530d488c06d878f5a869f60]
#
# patch "packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro"
# from [dbe147413ee323af4d45d2c5af6c952819036889]
# to [553fa4886d4d4d4069f4e83ac39de07cdae137df]
#
============================================================
--- conf/checksums.ini 433552e2a721db8f9a76e79dab97e5b4b7d8086a
+++ conf/checksums.ini 7baa470a5270fde2a46d8d08c5cfaf8a37088211
@@ -2115,8 +2115,8 @@ sha256=d5b93fb8dbfa73e4a542bb8ad7d61c8b4
sha256=d5b93fb8dbfa73e4a542bb8ad7d61c8b48dcf79948da26da9e9ef3b1a49c4221
[http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2]
-md5=815b8e5bd71c19d6af96aed6bf9e2ee7
-sha256=db61f4ac7e3fe252d6d547ff2ddd25a2f5411afd42c05f4d1efd6038a7d09e3d
+md5=e006cde4b4a28cfce95e43710cd126a9
+sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575
[http://downloads.sourceforge.net/atmelwlandriver/atmelwlandriver-3.3.5.6.tar.bz2]
md5=dd9a11d175ba0fbb62cf7fec5426f5de
============================================================
--- conf/distro/include/slugos.inc 47d957509a4544befa6f680d588017bfde7d0782
+++ conf/distro/include/slugos.inc 4105c50380f9423e8f6ed3e2a3621f5d19cec855
@@ -111,7 +111,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ix
# Select the correct versions of the kernel and modules (these are the
# defaults, override in the conf/distro top-level distro file).
PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.1"
# Select the smallest provider of x11 libraries
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
============================================================
--- packages/aiostress/aiostress_0.0.bb 23c25f3ecebe631b96b86efb89f20c3e9c5340bc
+++ packages/aiostress/aiostress_0.0.bb 40b69a46236237b807685002fe611632ac9373b1
@@ -1,8 +1,9 @@ DEPENDS = "libaio"
DESCRIPTION = "Asynchronous I/O stress util"
LICENSE = "GPLv2"
DEPENDS = "libaio"
+PR="r1"
-SRC_URI = "ftp://ftp.suse.com/pub/people/mason/utils/aio-stress.c;md5sum=727e5fc3566837b3ea72f887d048769b"
+SRC_URI = "http://mirrors.easynews.com/linux/suse/people/mason/utils/aio-stress.c"
S = "${WORKDIR}"
============================================================
--- packages/hdparm/hdparm-6.9/uclibc.patch 475f45ee6bbdda84be64887ef6ccac075bb0c0d1
+++ packages/hdparm/hdparm-6.9/uclibc.patch d4ad8872c7bae0d84fe81e207e0831a44adb0496
@@ -1,7 +1,7 @@ Index: hdparm-6.9/hdparm.c
Index: hdparm-6.9/hdparm.c
===================================================================
---- hdparm-6.9.orig/hdparm.c 2007-03-05 14:02:03.000000000 +0100
-+++ hdparm-6.9/hdparm.c 2007-03-05 14:02:23.000000000 +0100
+--- hdparm-6.9.orig/hdparm.c 2007-05-20 20:12:58.000000000 +0200
++++ hdparm-6.9/hdparm.c 2007-05-20 20:13:31.000000000 +0200
@@ -16,7 +16,9 @@
#include <sys/times.h>
#include <sys/types.h>
@@ -12,10 +12,37 @@ Index: hdparm-6.9/hdparm.c
#include <linux/hdreg.h>
#include <linux/major.h>
#include <byteswap.h>
+@@ -1311,7 +1313,7 @@
+ perror(" HDIO_GET_IDENTITY failed");
+ }
+ if (get_IDentity) {
+- __u16 *id;
++ uint16_t *id;
+ unsigned char args[4+512] = {WIN_IDENTIFY,0,0,1,}; // FIXME?
+ unsigned i;
+ if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
+@@ -1321,7 +1323,7 @@
+ goto identify_abort;
+ }
+ }
+- id = (__u16 *)&args[4];
++ id = (uint16_t *)&args[4];
+ if (get_IDentity == 2) {
+ for (i = 0; i < (256/8); ++i) {
+ printf("%04x %04x %04x %04x %04x %04x %04x %04x\n", id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7]);
+@@ -1609,7 +1611,7 @@
+ && ishex(d[++digit] = getchar())
+ && ishex(d[++digit] = getchar())) {
+ sbuf[wc] = (fromhex(d[0]) << 12) | (fromhex(d[1]) << 8) | (fromhex(d[2]) << 4) | fromhex(d[3]);
+- le16_to_cpus((__u16 *)(&sbuf[wc]));
++ le16_to_cpus((uint16_t *)(&sbuf[wc]));
+ ++wc;
+ } else if (d[digit] == EOF) {
+ goto eof;
Index: hdparm-6.9/hdparm.h
===================================================================
--- hdparm-6.9.orig/hdparm.h 2006-04-28 16:33:01.000000000 +0200
-+++ hdparm-6.9/hdparm.h 2007-03-05 14:03:10.000000000 +0100
++++ hdparm-6.9/hdparm.h 2007-05-20 20:12:58.000000000 +0200
@@ -1,6 +1,6 @@
/* Some prototypes for extern functions. */
============================================================
--- packages/linux/ixp4xx-kernel/2.6.21/defconfig 03dc5844da1a0da465404476fd256defb757fab1
+++ packages/linux/ixp4xx-kernel/2.6.21/defconfig 1e00d753e5ad2c0fb0f3c0a080c4b744b897d2d1
@@ -1164,7 +1164,6 @@ CONFIG_I2C_IXP4XX=y
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PASEMI is not set
# CONFIG_I2C_PROSAVAGE is not set
# CONFIG_I2C_SAVAGE4 is not set
# CONFIG_I2C_SIS5595 is not set
============================================================
--- packages/linux/ixp4xx-kernel_2.6.21.bb fd002140097d8c025bb6c4ea695d59efcd1c7ee1
+++ packages/linux/ixp4xx-kernel_2.6.21.1.bb f305d59949bc465d1530d488c06d878f5a869f60
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "839"
+IXP4XX_KERNEL_SVN_REV = "847"
#
# The directory containing the patches to be applied is
# specified below
============================================================
--- packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro dbe147413ee323af4d45d2c5af6c952819036889
+++ packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro 553fa4886d4d4d4069f4e83ac39de07cdae137df
@@ -25,8 +25,8 @@ COMPAT_ATEXIT=y
MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y
COMPAT_ATEXIT=y
-# UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y
More information about the Openembedded-commits
mailing list