[oe-commits] org.oe.dev merge of 'a49fe2e2da0e39e35809f715b1dcda205597a1ec'
hrw commit
openembedded-commits at lists.openembedded.org
Fri Aug 3 09:51:56 UTC 2007
merge of 'a49fe2e2da0e39e35809f715b1dcda205597a1ec'
and 'f3673f80e35fb4097d5f8c0d985464aa797b71f4'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 6bfc73feb49eca374b487de64bcebed7a32792e1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6bfc73feb49eca374b487de64bcebed7a32792e1
Files:
1
packages/linux/linux-rp_2.6.21.bb
classes/patch.bbclass
packages/libnfnetlink/libnfnetlink_0.0.30.bb
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/xcb/xcb-util_git.bb
Diffs:
#
# mt diff -ra49fe2e2da0e39e35809f715b1dcda205597a1ec -r6bfc73feb49eca374b487de64bcebed7a32792e1
#
#
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [a4ef82513766940d2b728b8089a10118cda3dc9a]
# to [d80feb79f4ed86271008fb110587f45d2a76a4a8]
#
============================================================
--- packages/linux/linux-rp_2.6.21.bb a4ef82513766940d2b728b8089a10118cda3dc9a
+++ packages/linux/linux-rp_2.6.21.bb d80feb79f4ed86271008fb110587f45d2a76a4a8
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r9"
+PR = "r10"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -33,7 +33,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
${RPSRC}/usb_pxa27x_udc-r4.patch;patch=1 \
${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
- ${RPSRC}/poodle_pm-r3.patch;patch=1 \
+ ${RPSRC}/poodle_pm-r4.patch;patch=1 \
${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
${RPSRC}/w100_extaccel-r0.patch;patch=1 \
${RPSRC}/asoc_fix_typo-r0.patch;patch=1 \
#
# mt diff -rf3673f80e35fb4097d5f8c0d985464aa797b71f4 -r6bfc73feb49eca374b487de64bcebed7a32792e1
#
#
#
# patch "classes/patch.bbclass"
# from [501ddb8911d7ccbf0fec063727781c8a4647692a]
# to [13f060e11ac73613512bdea10a347394f120fba9]
#
# patch "packages/libnfnetlink/libnfnetlink_0.0.30.bb"
# from [0bb5cccf99fbfae2cfaf7e9737675f1933d83c2b]
# to [bfbb90ec91d7018e619075ddf641c1ecfc833c67]
#
# patch "packages/linux/ixp4xx-kernel/2.6.21/defconfig"
# from [1e00d753e5ad2c0fb0f3c0a080c4b744b897d2d1]
# to [2066088fb6f08b47ace0f9b1b4755bc9ea14fed6]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
# from [0b15c2bd8e24d2c3c24fab57a684fe921123a952]
# to [4c21f111521b327915ac064d09fa63c6d1b1891b]
#
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
# from [1f363d64742737bc103dabdfe8ea7079ea768b49]
# to [10c5f028c9b6c543f29a92c40be16b67b5115751]
#
# patch "packages/xcb/xcb-util_git.bb"
# from [232b9333381e26739b0014181f425f9973698cfd]
# to [0375f2a34fa9f265cc896112c4244af538394eb2]
#
============================================================
--- classes/patch.bbclass 501ddb8911d7ccbf0fec063727781c8a4647692a
+++ classes/patch.bbclass 13f060e11ac73613512bdea10a347394f120fba9
@@ -492,34 +492,36 @@ python patch_do_patch() {
else:
pname = os.path.basename(unpacked)
- if "mindate" in parm:
- mindate = parm["mindate"]
- else:
- mindate = 0
+ if "mindate" in parm or "maxdate" in parm:
+ pn = bb.data.getVar('PN', d, 1)
+ srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+ if not srcdate:
+ srcdate = bb.data.getVar('SRCDATE', d, 1)
- if "maxdate" in parm:
- maxdate = parm["maxdate"]
- else:
- maxdate = "20711226"
+ if srcdate == "now":
+ srcdate = bb.data.getVar('DATE', d, 1)
- pn = bb.data.getVar('PN', d, 1)
- srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+ if "maxdate" in parm and parm["maxdate"] < srcdate:
+ bb.note("Patch '%s' is outdated" % pname)
+ continue
- if not srcdate:
- srcdate = bb.data.getVar('SRCDATE', d, 1)
+ if "mindate" in parm and parm["mindate"] > srcdate:
+ bb.note("Patch '%s' is predated" % pname)
+ continue
- if srcdate == "now":
- srcdate = bb.data.getVar('DATE', d, 1)
- if (maxdate < srcdate) or (mindate > srcdate):
- if (maxdate < srcdate):
- bb.note("Patch '%s' is outdated" % pname)
+ if "minrev" in parm:
+ srcrev = bb.data.getVar('SRCREV', d, 1)
+ if srcrev and srcrev < parm["minrev"]:
+ bb.note("Patch '%s' applies to later revisions" % pname)
+ continue
- if (mindate > srcdate):
- bb.note("Patch '%s' is predated" % pname)
+ if "maxrev" in parm:
+ srcrev = bb.data.getVar('SRCREV', d, 1)
+ if srcrev and srcrev > parm["maxrev"]:
+ bb.note("Patch '%s' applies to earlier revisions" % pname)
+ continue
- continue
-
bb.note("Applying patch '%s'" % pname)
try:
patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True)
============================================================
--- packages/libnfnetlink/libnfnetlink_0.0.30.bb 0bb5cccf99fbfae2cfaf7e9737675f1933d83c2b
+++ packages/libnfnetlink/libnfnetlink_0.0.30.bb bfbb90ec91d7018e619075ddf641c1ecfc833c67
@@ -15,6 +15,7 @@ do_configure() {
do_configure() {
gnu-configize
+ libtoolize --force
oe_runconf
}
============================================================
--- packages/linux/ixp4xx-kernel/2.6.21/defconfig 1e00d753e5ad2c0fb0f3c0a080c4b744b897d2d1
+++ packages/linux/ixp4xx-kernel/2.6.21/defconfig 2066088fb6f08b47ace0f9b1b4755bc9ea14fed6
@@ -883,12 +883,12 @@ CONFIG_NET_ETHERNET=y
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_IXP4XX_QMGR=y
-CONFIG_IXP4XX_NPE=y
+CONFIG_MII=m
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
CONFIG_IXP4XX_NPE_FW_LOAD=y
CONFIG_IXP4XX_NPE_FW_MTD=y
-CONFIG_IXP4XX_MAC=y
+CONFIG_IXP4XX_MAC=m
CONFIG_IXP4XX_CRYPTO=m
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
@@ -1537,7 +1537,7 @@ CONFIG_USB_DEVICEFS=y
#
# USB Host Controller Drivers
#
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_SPLIT_ISO=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
============================================================
--- packages/linux/ixp4xx-kernel_2.6.21.6.bb 0b15c2bd8e24d2c3c24fab57a684fe921123a952
+++ packages/linux/ixp4xx-kernel_2.6.21.6.bb 4c21f111521b327915ac064d09fa63c6d1b1891b
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "911"
+IXP4XX_KERNEL_SVN_REV = "914"
#
# The directory containing the patches to be applied is
# specified below
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb 1f363d64742737bc103dabdfe8ea7079ea768b49
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb 10c5f028c9b6c543f29a92c40be16b67b5115751
@@ -1,8 +1,8 @@ PV = "0.1.0+svnr${SRCDATE}"
DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
SECTION = "openmoko/base"
RCONFLICTS = "openmoko-theme-standard"
PV = "0.1.0+svnr${SRCDATE}"
-PR = "r1"
+PR = "r2"
inherit openmoko2
============================================================
--- packages/xcb/xcb-util_git.bb 232b9333381e26739b0014181f425f9973698cfd
+++ packages/xcb/xcb-util_git.bb 0375f2a34fa9f265cc896112c4244af538394eb2
@@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE = "-1"
-include xcb-util.git
+include xcb-util.inc
PV = "0.2+git"
PR = "r0"
More information about the Openembedded-commits
mailing list