summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/libnfnetlink/libnfnetlink_0.0.30.bb1
-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/openmoko2/openmoko-theme-standard2_svn.bb2
-rw-r--r--packages/xcb/xcb-util_git.bb2
5 files changed, 9 insertions, 8 deletions
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"