diff options
| -rw-r--r-- | classes/patch.bbclass | 44 | ||||
| -rw-r--r-- | packages/libnfnetlink/libnfnetlink_0.0.30.bb | 1 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.21/defconfig | 10 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.21.6.bb | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-theme-standard2_svn.bb | 2 | ||||
| -rw-r--r-- | packages/xcb/xcb-util_git.bb | 2 |
6 files changed, 32 insertions, 29 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/libnfnetlink/libnfnetlink_0.0.30.bb b/packages/libnfnetlink/libnfnetlink_0.0.30.bb index e4a76f5074..d3e3cabdc7 100644 --- a/packages/libnfnetlink/libnfnetlink_0.0.30.bb +++ b/packages/libnfnetlink/libnfnetlink_0.0.30.bb @@ -15,6 +15,7 @@ inherit autotools pkgconfig do_configure() { gnu-configize + libtoolize --force oe_runconf } 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/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/xcb/xcb-util_git.bb b/packages/xcb/xcb-util_git.bb index 9ffae6d5cb..8806081b75 100644 --- a/packages/xcb/xcb-util_git.bb +++ b/packages/xcb/xcb-util_git.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include xcb-util.git +include xcb-util.inc PV = "0.2+git" PR = "r0" |