diff options
| -rw-r--r-- | packages/linux/linux-rp_2.6.19.bb | 8 | ||||
| -rw-r--r-- | packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb index b13b127722..3f0472ecdd 100644 --- a/packages/linux/linux-rp_2.6.19.bb +++ b/packages/linux/linux-rp_2.6.19.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" @@ -16,6 +16,8 @@ DEFAULT_PREFERENCE = "-1" # Hacks should clearly named and at the bottom SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \ + ${RPSRC}/pxafb_fix_params-r1.patch;patch=1 \ + ${RPSRC}/pxa_irda_susres_fix-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r27.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ @@ -27,12 +29,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ - ${RPSRC}/usb_pxa27x_udc-r1.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \ + ${RPSRC}/usb_pxa27x_udc-r2.patch;patch=1 \ ${DOSRC}/kexec-arm-r3.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \ ${RPSRC}/poodle_pm-r3.patch;patch=1 \ - ${RPSRC}/pxa27x_overlay-r3.patch;patch=1 \ + ${RPSRC}/pxa27x_overlay-r4.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index 4e39aa6ace..6a8e43ec9c 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys ) || exit 1 rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake |