[oe-commits] org.oe.dev merge of 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'
mickeyl commit
oe at amethyst.openembedded.net
Wed Apr 30 13:04:11 UTC 2008
merge of 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'
and 'ff99add05b70c6e96f011a1a27dd980a5380a7bf'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d80e8cda859a7ac2845d1687345f0b70b733db10
ViewMTN: http://monotone.openembedded.org/revision/info/d80e8cda859a7ac2845d1687345f0b70b733db10
Files:
1
packages/madwifi/madwifi-ng_r1844-20061208.bb
packages/madwifi/madwifi-ng_r2100-20070210.bb
packages/madwifi/madwifi-ng_r2156-20070225.bb
packages/madwifi/madwifi-ng_r2182-20070308.bb
packages/madwifi/madwifi-ng_r2187-20070309.bb
packages/madwifi/madwifi-ng_r2518-20070626.bb
packages/madwifi/madwifi-ng_r2702-20070903.bb
packages/netbase/netbase/mpc8313e-rdb
packages/u-boot/u-boot-1.3.2
packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2
packages/binutils/binutils-avr32.inc
packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch
packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2
packages/gdb/gdb-avr32.inc
packages/linux/linux-omap2-git/beagleboard/usb-timout.patch
packages/netbase/netbase/mpc8313e-rdb/interfaces
packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch
packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch
packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch
MAINTAINERS
classes/kernel.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-uclibc.inc
conf/machine/mpc8313e-rdb.conf
packages/binutils/binutils.inc
packages/binutils/binutils_2.17.bb
packages/gcc/gcc-4.2.2.inc
packages/gdb/gdb-cross.inc
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/madwifi/madwifi-ng_r3314-20080131.bb
packages/meta/slugos-packages.bb
packages/opkg/opkg_svn.bb
packages/u-boot/u-boot_1.3.2.bb
mtn:manual_merge
true
packages/efl1/imlib2_cvs.bb
Diffs:
#
# mt diff -rb84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312 -rd80e8cda859a7ac2845d1687345f0b70b733db10
#
#
#
# delete "packages/madwifi/madwifi-ng_r1844-20061208.bb"
#
# delete "packages/madwifi/madwifi-ng_r2100-20070210.bb"
#
# delete "packages/madwifi/madwifi-ng_r2156-20070225.bb"
#
# delete "packages/madwifi/madwifi-ng_r2182-20070308.bb"
#
# delete "packages/madwifi/madwifi-ng_r2187-20070309.bb"
#
# delete "packages/madwifi/madwifi-ng_r2518-20070626.bb"
#
# delete "packages/madwifi/madwifi-ng_r2702-20070903.bb"
#
# add_dir "packages/netbase/netbase/mpc8313e-rdb"
#
# add_dir "packages/u-boot/u-boot-1.3.2"
#
# add_file "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
# content [61afa951e7c1dbe064e1134cfd7c2c4e9f919fb7]
#
# add_file "packages/binutils/binutils-avr32.inc"
# content [5bd29b107e09714fb7b1d4bf3f8e6d5196a9ca37]
#
# add_file "packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch"
# content [a993a533b9e9b03a015aae1cbf427aa4e7f323e7]
#
# add_file "packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2"
# content [65d3733847d1b916ba3fafcf88127711a6fec8ba]
#
# add_file "packages/gdb/gdb-avr32.inc"
# content [7494151dbc5adbc235fbc5181d3392875c7f4e35]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/usb-timout.patch"
# content [7acb9cec9859f0c448ef4b56bf2ebd12e8b84c2b]
#
# add_file "packages/netbase/netbase/mpc8313e-rdb/interfaces"
# content [2ece41786062e70093a58ef17e23d35ea084c316]
#
# add_file "packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch"
# content [d10d1edb2510c27cbbfca47e962cfc8da45f0788]
#
# add_file "packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch"
# content [20746984bb1c6ef2789381da1283a8e06a74b0ac]
#
# add_file "packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch"
# content [64eee6cc9ba75710f130f074b0632df44049ca14]
#
# patch "MAINTAINERS"
# from [5556c9277c3381070987310400058abdd5f4c820]
# to [df1acfac3b7175de3f71ec85623148d285a64116]
#
# patch "classes/kernel.bbclass"
# from [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]
# to [8ed575119a74e50c5bcb39266997cba3f60792c2]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [6f251e8e8c830f7c3e1ebbed08e46a6c642556d9]
# to [dd2138b465f663603f99ce6be674dfd46af8c33f]
#
# patch "conf/distro/include/angstrom-uclibc.inc"
# from [bd467a8983d81901f98163052c0537bbf2909f15]
# to [ed3615a8cce5b329c1b4354ca91a98190a64f862]
#
# patch "conf/machine/mpc8313e-rdb.conf"
# from [9521bcf148591a9c5c88e316475ce8493488eaf2]
# to [ca05aff54fbbce7e6178f63cd81e0262c9607193]
#
# patch "packages/binutils/binutils.inc"
# from [f448bed26fe1742f47791f2fa478603cc6c038b5]
# to [ec08872ebf090adf38f8ae73969a35b3cf0f98ae]
#
# patch "packages/binutils/binutils_2.17.bb"
# from [22565b10082a0e16f29e89a55311c299acbc31c1]
# to [99e9c269f46aafaced069158eb736ec2b3c100b9]
#
# patch "packages/gcc/gcc-4.2.2.inc"
# from [e1a01a5ff03489319241b841ece209ab4fdcbc72]
# to [6281a032714b397b43955b47208a1dd89efdd74b]
#
# patch "packages/gdb/gdb-cross.inc"
# from [f22b5bdf741d9b9ce7a69086a1b6ff8dc8383420]
# to [fc0d500641c93bb88bc035f650bb82fd9a102324]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [ffa35a912f2d6c8016f6ea1d0f7ebb27987a9b28]
# to [6defc6fa96f79492acbfbaed1cc6553abe5edc13]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [c46412b985389cdee793c4670885ae00a0bfc7c3]
# to [d2df9d873b73d322c1d6a7918ef9c8786b091e48]
#
# patch "packages/madwifi/madwifi-ng_r3314-20080131.bb"
# from [aa87cb14b8005f3b927e4701b1ae845bf2099ec2]
# to [24403394f09cfebacade21edca4dbf1c9fe180ba]
#
# patch "packages/meta/slugos-packages.bb"
# from [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]
# to [f62c22f94a5ba8a475afc6d43721c4e29386ca2e]
#
# patch "packages/opkg/opkg_svn.bb"
# from [bc27245782ad8e3348db57c3d14c9e75b4f1b404]
# to [e034851c3a5985b17cbde739bc5bb59a8c69d323]
#
# patch "packages/u-boot/u-boot_1.3.2.bb"
# from [8cfd5293c0214179a38b2304fbd10c77a3912aff]
# to [33ac513192e4695c4ea43a787d866c98c2a011ef]
#
# set "packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 is binary
============================================================
--- packages/binutils/binutils-avr32.inc 5bd29b107e09714fb7b1d4bf3f8e6d5196a9ca37
+++ packages/binutils/binutils-avr32.inc 5bd29b107e09714fb7b1d4bf3f8e6d5196a9ca37
@@ -0,0 +1,31 @@
+# Extra tasks required when using Atmel's patches to binutils
+# See http://avr32linux.org/twiki/bin/view/Main/BinutilsPatches for
+# more information
+
+
+do_avr32_reconf () {
+ if test ${TARGET_ARCH} == avr32; then
+ (cd ${S} && autoconf-2.13) || die "Error running autoconf"
+ for dir in bfd opcodes binutils ld; do
+ (cd "${S}/$dir" &&
+ aclocal-1.9 &&
+ autoconf &&
+ automake-1.9 &&
+ autoheader) || die "Error reconfiguring $dir"
+ done
+ fi
+}
+
+
+do_avr32_configure_bfd () {
+ if test ${TARGET_ARCH} == avr32; then
+ (cd ${B} && make configure-bfd) || die "Error running 'make configure-bfd'"
+ (cd ${B}/bfd && make headers) || die "Error running 'make headers'"
+ fi
+}
+
+
+
+addtask avr32_reconf after do_patch before do_configure
+addtask avr32_configure_bfd after do_configure before do_compile
+
============================================================
--- packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch a993a533b9e9b03a015aae1cbf427aa4e7f323e7
+++ packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch a993a533b9e9b03a015aae1cbf427aa4e7f323e7
@@ -0,0 +1,13 @@
+Index: gcc-4.2.2/gcc/config/avr32/avr32.c
+===================================================================
+--- gcc-4.2.2.orig/gcc/config/avr32/avr32.c 2008-04-08 10:42:47.000000000 +0200
++++ gcc-4.2.2/gcc/config/avr32/avr32.c 2008-04-08 10:43:33.000000000 +0200
+@@ -161,7 +161,7 @@
+ /* Set default target_flags. */
+ #undef TARGET_DEFAULT_TARGET_FLAGS
+ #define TARGET_DEFAULT_TARGET_FLAGS \
+- (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION | MASK_COND_EXEC_BEFORE_RELOAD)
++ (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION)
+
+ void
+ avr32_optimization_options (int level,
============================================================
# packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2 is binary
============================================================
--- packages/gdb/gdb-avr32.inc 7494151dbc5adbc235fbc5181d3392875c7f4e35
+++ packages/gdb/gdb-avr32.inc 7494151dbc5adbc235fbc5181d3392875c7f4e35
@@ -0,0 +1,32 @@
+# Perform tasks required to use Atmel's AVR32 patches
+# See http://avr32linux.org/twiki/bin/view/Main/GDBPatches for more info
+
+
+do_avr32_reconf () {
+ if test ${TARGET_ARCH} == "avr32"; then
+ (cd ${S} && autoconf) || \
+ die "failure running autoconf in top-level gdb"
+
+ (cd ${S}/bfd && autoreconf) || \
+ die "failure running autoreconf in bfd/"
+
+ (cd ${S}/opcodes && autoreconf) || \
+ die "failure running autoreconf in opcodes/"
+ fi
+
+}
+
+
+
+do_avr32_configure_bfd () {
+ if test ${TARGET_ARCH} == "avr32"; then
+ (cd ${B} && make configure-bfd) || die "Error running configure-bfd"
+ (cd ${B}/bfd && make headers) || \
+ die "error running 'make headers' in bfd"
+ fi
+}
+
+
+addtask avr32_reconf after do_patch before do_configure
+addtask avr32_configure_bfd after do_configure before do_compile
+
============================================================
--- packages/linux/linux-omap2-git/beagleboard/usb-timout.patch 7acb9cec9859f0c448ef4b56bf2ebd12e8b84c2b
+++ packages/linux/linux-omap2-git/beagleboard/usb-timout.patch 7acb9cec9859f0c448ef4b56bf2ebd12e8b84c2b
@@ -0,0 +1,11 @@
+--- /tmp/ehci-hub.c 2008-04-30 11:41:59.381876290 +0200
++++ git/drivers/usb/host/ehci-hub.c 2008-04-30 11:42:20.522875367 +0200
+@@ -734,7 +734,7 @@
+ * this bit; seems too long to spin routinely...
+ */
+ retval = handshake(ehci, status_reg,
+- PORT_RESET, 0, 750);
++ PORT_RESET, 0, 1250);
+ if (retval != 0) {
+ ehci_err (ehci, "port %d reset error %d\n",
+ wIndex + 1, retval);
============================================================
--- packages/netbase/netbase/mpc8313e-rdb/interfaces 2ece41786062e70093a58ef17e23d35ea084c316
+++ packages/netbase/netbase/mpc8313e-rdb/interfaces 2ece41786062e70093a58ef17e23d35ea084c316
@@ -0,0 +1,16 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired interface
+auto eth1
+iface eth1 inet dhcp
+
+# Wireless interface
+auto ath0
+iface ath0 inet static
+ address 192.168.99.1
+ netmask 255.255.255.0
+
============================================================
--- packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch d10d1edb2510c27cbbfca47e962cfc8da45f0788
+++ packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch d10d1edb2510c27cbbfca47e962cfc8da45f0788
@@ -0,0 +1,12 @@
+diff -urN u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h u-boot-1.3.1/include/configs/MPC8313ERDB.h
+--- u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h 2007-12-06 10:21:19.000000000 +0100
++++ u-boot-1.3.1/include/configs/MPC8313ERDB.h 2008-01-31 17:38:10.000000000 +0100
+@@ -522,7 +522,7 @@
+ #define CONFIG_FDTFILE mpc8313erdb.dtb
+
+ #define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+-#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
++#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
+ #define CONFIG_BAUDRATE 115200
+
+ #define XMK_STR(x) #x
============================================================
--- packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch 20746984bb1c6ef2789381da1283a8e06a74b0ac
+++ packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch 20746984bb1c6ef2789381da1283a8e06a74b0ac
@@ -0,0 +1,35 @@
+diff -urN u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h u-boot-1.3.2/include/configs/MPC8313ERDB.h
+--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h 2008-03-09 16:20:02.000000000 +0100
++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h 2008-04-21 19:20:51.000000000 +0200
+@@ -179,7 +179,7 @@
+ #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
+
+ /* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+-#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
++#define CFG_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */
+ #define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */
+
+ /*
+@@ -354,6 +354,7 @@
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_I2C
++#define CONFIG_CMD_JFFS2
+ #define CONFIG_CMD_MII
+ #define CONFIG_CMD_DATE
+ #define CONFIG_CMD_PCI
+@@ -365,6 +366,14 @@
+
+ #define CONFIG_CMDLINE_EDITING 1
+
++/*
++ * JFFS2 partitions (mtdparts command line support)
++ */
++#define CONFIG_JFFS2_CMDLINE
++#define CONFIG_JFFS2_NAND
++#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=nand0"
++#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:384k(uboot),64k(env)"
++
+
+ /*
+ * Miscellaneous configurable options
============================================================
--- packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch 64eee6cc9ba75710f130f074b0632df44049ca14
+++ packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch 64eee6cc9ba75710f130f074b0632df44049ca14
@@ -0,0 +1,895 @@
+diff -urN u-boot-1.3.1.orig/board/freescale/mpc8313erdb/Makefile u-boot-1.3.1/board/freescale/mpc8313erdb/Makefile
+--- u-boot-1.3.1.orig/board/freescale/mpc8313erdb/Makefile 2007-12-06 10:21:19.000000000 +0100
++++ u-boot-1.3.1/board/freescale/mpc8313erdb/Makefile 2008-01-31 17:35:43.000000000 +0100
+@@ -25,7 +25,7 @@
+
+ LIB = $(obj)lib$(BOARD).a
+
+-COBJS := $(BOARD).o sdram.o
++COBJS := $(BOARD).o sdram.o nand.o
+
+ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS := $(addprefix $(obj),$(COBJS))
+diff -urN u-boot-1.3.1.orig/board/freescale/mpc8313erdb/nand.c u-boot-1.3.1/board/freescale/mpc8313erdb/nand.c
+--- u-boot-1.3.1.orig/board/freescale/mpc8313erdb/nand.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-1.3.1/board/freescale/mpc8313erdb/nand.c 2008-01-31 17:35:26.000000000 +0100
+@@ -0,0 +1,868 @@
++/*
++ * Copyright (C) Freescale Semiconductor, Inc. 2006.
++ *
++ * Initialized by Nick.Spence at freescale.com
++ * Wilson.Lo at freescale.com
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++#include <common.h>
++
++#if defined(CONFIG_CMD_NAND)
++#if defined(CFG_NAND_LEGACY)
++ #error "U-Boot legacy NAND commands not supported."
++#else
++
++#include <malloc.h>
++#include <asm/errno.h>
++#include <nand.h>
++
++#undef CFG_FCM_DEBUG
++#define CFG_FCM_DEBUG_LVL 1
++#ifdef CFG_FCM_DEBUG
++#define FCM_DEBUG(n, args...) \
++ do { \
++ if (n <= (CFG_FCM_DEBUG_LVL + 0)) \
++ printf(args); \
++ } while(0)
++#else /* CONFIG_FCM_DEBUG */
++#define FCM_DEBUG(n, args...) do { } while(0)
++#endif
++
++#define MIN(x, y) ((x < y) ? x : y)
++
++#define ERR_BYTE 0xFF /* Value returned for read bytes when read failed */
++
++#define FCM_TIMEOUT_USECS 100000 /* Maximum number of uSecs to wait for FCM */
++
++/* Private structure holding NAND Flash device specific information */
++struct fcm_nand {
++ int bank; /* Chip select bank number */
++ unsigned int base; /* Chip select base address */
++ int pgs; /* NAND page size */
++ int oobbuf; /* Pointer to OOB block */
++ unsigned int page; /* Last page written to / read from */
++ unsigned int fmr; /* FCM Flash Mode Register value */
++ unsigned int mdr; /* UPM/FCM Data Register value */
++ unsigned int use_mdr; /* Non zero if the MDR is to be set */
++ u_char *addr; /* Address of assigned FCM buffer */
++ unsigned int read_bytes; /* Number of bytes read during command */
++ unsigned int index; /* Pointer to next byte to 'read' */
++ unsigned int req_bytes; /* Number of bytes read if command ok */
++ unsigned int req_index; /* New read index if command ok */
++ unsigned int status; /* status read from LTESR after last op*/
++};
++
++
++/* These map to the positions used by the FCM hardware ECC generator */
++
++/* Small Page FLASH with FMR[ECCM] = 0 */
++static struct nand_oobinfo fcm_oob_sp_eccm0 = { /* TODO */
++ .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
++ .eccbytes = 3,
++ .eccpos = {6, 7, 8},
++ .oobfree = { {0, 5}, {9, 7} }
++};
++
++/* Small Page FLASH with FMR[ECCM] = 1 */
++static struct nand_oobinfo fcm_oob_sp_eccm1 = { /* TODO */
++ .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
++ .eccbytes = 3,
++ .eccpos = {8, 9, 10},
++ .oobfree = { {0, 5}, {6, 2}, {11, 5} }
++};
++
++/* Large Page FLASH with FMR[ECCM] = 0 */
++static struct nand_oobinfo fcm_oob_lp_eccm0 = {
++ .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
++ .eccbytes = 12,
++ .eccpos = {6, 7, 8, 22, 23, 24, 38, 39, 40, 54, 55, 56},
++ .oobfree = { {1, 5}, {9, 13}, {25, 13}, {41, 13}, {57, 7} }
++};
++
++/* Large Page FLASH with FMR[ECCM] = 1 */
++static struct nand_oobinfo fcm_oob_lp_eccm1 = {
++ .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */
++ .eccbytes = 12,
++ .eccpos = {8, 9, 10, 24, 25, 2%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rff99add05b70c6e96f011a1a27dd980a5380a7bf -rd80e8cda859a7ac2845d1687345f0b70b733db10
#
#
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
# to [5c3c8c06ae6d9a4d18d10a066fc8973ec535e871]
#
============================================================
--- packages/efl1/imlib2_cvs.bb 90324b9d8bfadfca430da3b72c2b1f9c7089ee52
+++ packages/efl1/imlib2_cvs.bb 5c3c8c06ae6d9a4d18d10a066fc8973ec535e871
@@ -3,12 +3,10 @@ PV = "1.4.1.000+cvs${SRCDATE}"
# can also depend on tiff34, ungif or gif, z, bz2, id3tag
DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
PV = "1.4.1.000+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit efl
-SRC_URI += "file://remove-local-includes.patch;patch=1"
-
EXTRA_OECONF = "--with-x"
# TODO: Use more fine granular version
More information about the Openembedded-commits
mailing list