summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/patch.bbclass44
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.21/defconfig10
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.6.bb2
-rw-r--r--packages/linux/linux-rp_2.6.21.bb4
-rw-r--r--packages/openmoko2/openmoko-theme-standard2_svn.bb2
-rw-r--r--packages/tslib/tslib/htctornado/ts.conf0
-rw-r--r--packages/tslib/tslib/htctornado/tslib.sh6
-rw-r--r--packages/tslib/tslib_1.0.bb2
-rw-r--r--packages/xorg-app/xrandr_1.2.0.bb3
-rw-r--r--packages/xorg-util/makedepend-native_1.0.1.bb1
10 files changed, 35 insertions, 39 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 12657fa0f6..2ba6729af8 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -492,33 +492,35 @@ python patch_do_patch() {
else:
pname = os.path.basename(unpacked)
- if "mindate" in parm:
- mindate = parm["mindate"]
- else:
- mindate = 0
-
- if "maxdate" in parm:
- maxdate = parm["maxdate"]
- else:
- maxdate = "20711226"
-
- pn = bb.data.getVar('PN', d, 1)
- srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+ 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 not srcdate:
- srcdate = bb.data.getVar('SRCDATE', d, 1)
+ if srcdate == "now":
+ srcdate = bb.data.getVar('DATE', d, 1)
- if srcdate == "now":
- srcdate = bb.data.getVar('DATE', d, 1)
-
- if (maxdate < srcdate) or (mindate > srcdate):
- if (maxdate < srcdate):
+ if "maxdate" in parm and parm["maxdate"] < srcdate:
bb.note("Patch '%s' is outdated" % pname)
+ continue
- if (mindate > srcdate):
+ if "mindate" in parm and parm["mindate"] > srcdate:
bb.note("Patch '%s' is predated" % pname)
+ continue
- continue
+
+ 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 "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
bb.note("Applying patch '%s'" % pname)
try:
diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
index 15b4ba5829..56474d512a 100644
--- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
@@ -883,12 +883,12 @@ CONFIG_TUN=m
# 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
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
index ae029136a9..ff90bcb3b3 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb
@@ -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
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index 980732d409..3f155942e9 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -1,6 +1,6 @@
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/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
${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 \
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index a5f3108093..bbeba4420f 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -2,7 +2,7 @@ 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
diff --git a/packages/tslib/tslib/htctornado/ts.conf b/packages/tslib/tslib/htctornado/ts.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/htctornado/ts.conf
diff --git a/packages/tslib/tslib/htctornado/tslib.sh b/packages/tslib/tslib/htctornado/tslib.sh
deleted file mode 100644
index 33c8c11d4f..0000000000
--- a/packages/tslib/tslib/htctornado/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# This indicates that we have no pointing device at all
-TSLIB_TSDEVICE=/dev/null
-
-export TSLIB_TSDEVICE
-
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 27e4958c18..f6df462f11 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -4,7 +4,7 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
SECTION = "base"
LICENSE = "LGPL"
-PR = "r13"
+PR = "r14"
SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
file://tslib-input_raw-grab_events.patch;patch=1 \
diff --git a/packages/xorg-app/xrandr_1.2.0.bb b/packages/xorg-app/xrandr_1.2.0.bb
index f876ba6b47..b730f6ce79 100644
--- a/packages/xorg-app/xrandr_1.2.0.bb
+++ b/packages/xorg-app/xrandr_1.2.0.bb
@@ -5,6 +5,5 @@ LICENSE= "BSD-X"
DEPENDS += " libxrandr libxrender virtual/libx11"
PE = "1"
-PR = "r1"
+PR = "r2"
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1" \ No newline at end of file
diff --git a/packages/xorg-util/makedepend-native_1.0.1.bb b/packages/xorg-util/makedepend-native_1.0.1.bb
index 554270e6e4..7fbe81a4a3 100644
--- a/packages/xorg-util/makedepend-native_1.0.1.bb
+++ b/packages/xorg-util/makedepend-native_1.0.1.bb
@@ -2,6 +2,7 @@ require xorg-util-common.inc
inherit native
DESCRIPTION = "create dependencies in makefiles"
+DEPENDS = "xproto-native"
PR = "r1"
PE = "1"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 08:17:42 +0000