From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga10.intel.com ([192.55.52.92] helo=fmsmga102.fm.intel.com) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1RNTKa-0003oc-Vp for openembedded-core@lists.openembedded.org; Mon, 07 Nov 2011 18:50:01 +0100 Received: from mail-wy0-f180.google.com ([74.125.82.180]) by mga11.intel.com with ESMTP/TLS/RC4-SHA; 07 Nov 2011 09:43:46 -0800 Received: by wye20 with SMTP id 20so5179599wye.25 for ; Mon, 07 Nov 2011 09:43:44 -0800 (PST) Received: by 10.216.180.8 with SMTP id i8mr3971991wem.26.1320687824435; Mon, 07 Nov 2011 09:43:44 -0800 (PST) Received: from [10.6.18.227] (c-71-193-189-117.hsd1.wa.comcast.net. [71.193.189.117]) by mx.google.com with ESMTPS id fw16sm28527338wbb.13.2011.11.07.09.43.42 (version=SSLv3 cipher=OTHER); Mon, 07 Nov 2011 09:43:43 -0800 (PST) Message-ID: <4EB818CC.10906@intel.com> Date: Mon, 07 Nov 2011 09:43:40 -0800 From: Saul Wold Organization: Intel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1320169056-19008-1-git-send-email-msm@freescale.com> In-Reply-To: <1320169056-19008-1-git-send-email-msm@freescale.com> Cc: Matthew McClintock Subject: Re: [PATCH v2] dtc: update to latest git version X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Nov 2011 17:50:01 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 11/01/2011 10:37 AM, Matthew McClintock wrote: > Also remove patches that are no longer needed, as well as use the > installation that is provided by the Makefile. Put all the extra > stuff in a new dtc-misc package > > Signed-off-by: Matthew McClintock > --- > meta/recipes-kernel/dtc/dtc.inc | 12 ++-- > .../dtc/fix_for_compilation_with_gcc_4.6.0.patch | 51 -------------------- > meta/recipes-kernel/dtc/dtc/remove_space_opt.patch | 18 ------- > meta/recipes-kernel/dtc/dtc_git.bb | 10 +--- > 4 files changed, 9 insertions(+), 82 deletions(-) > delete mode 100644 meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch > delete mode 100644 meta/recipes-kernel/dtc/dtc/remove_space_opt.patch > > diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc > index eae46ac..0f45d5f 100644 > --- a/meta/recipes-kernel/dtc/dtc.inc > +++ b/meta/recipes-kernel/dtc/dtc.inc > @@ -6,13 +6,13 @@ DEPENDS = "flex-native bison-native" > > inherit autotools > > -do_install() { > - install -m 0755 -d ${D}${bindir} > - install -m 755 dtc ${D}${bindir}/dtc > -} > SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \ > - file://fix_for_compilation_with_gcc_4.6.0.patch" > + " > > -INC_PR = "r0" > +EXTRA_OEMAKE='PREFIX="${prefix}"' > +INC_PR = "r1" > > S = "${WORKDIR}/git" > + > +PACKAGES =+ "${PN}-misc" > +FILES_${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff" > diff --git a/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch b/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch > deleted file mode 100644 > index b34894d..0000000 > --- a/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch > +++ /dev/null > @@ -1,51 +0,0 @@ > -Upstream-Status: Pending > - > -Fix following compilation errors with gcc 4.6.0 > -| dtc.c: In function 'main': > -| dtc.c:100:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable] > -| cc1: all warnings being treated as errors > -| > -| make: *** [dtc.o] Error 1 > -| make: *** Waiting for unfinished jobs.... > -| flattree.c: In function 'flat_read_mem_reserve': > -| flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable] > -| cc1: all warnings being treated as errors > -| > -| make: *** [flattree.o] Error 1 > -| ERROR: oe_runmake failed > - > -Nitin A Kamble 2011/05/10 > - > -Index: git/dtc.c > -=================================================================== > ---- git.orig/dtc.c > -+++ git/dtc.c > -@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) > - const char *inform = "dts"; > - const char *outform = "dts"; > - const char *outname = "-"; > -- int force = 0, check = 0; > -+ int force = 0, __attribute__((__unused__)) check = 0; > - const char *arg; > - int opt; > - FILE *outf = NULL; > -Index: git/flattree.c > -=================================================================== > ---- git.orig/flattree.c > -+++ git/flattree.c > -@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_me > - { > - struct reserve_info *reservelist = NULL; > - struct reserve_info *new; > -- const char *p; > - struct fdt_reserve_entry re; > - > - /* > -@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_me > - * > - * First pass, count entries. > - */ > -- p = inb->ptr; > - while (1) { > - flat_read_chunk(inb,&re, sizeof(re)); > - re.address = fdt64_to_cpu(re.address); > diff --git a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch b/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch > deleted file mode 100644 > index 8c26dec..0000000 > --- a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch > +++ /dev/null > @@ -1,18 +0,0 @@ > -Remove the -Os flag > - > -Upstream-Status: Inappropriate [configuration] > - > -Signed-off-by: Saul Wold > -Index: git/Makefile > -=================================================================== > ---- git.orig/Makefile > -+++ git/Makefile > -@@ -18,7 +18,7 @@ CONFIG_LOCALVERSION = > - CPPFLAGS = -I libfdt > - WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ > - -Wstrict-prototypes -Wmissing-prototypes > --CFLAGS = -g -Os -fPIC -Werror $(WARNINGS) > -+CFLAGS = -g -fPIC -Werror $(WARNINGS) > - > - BISON = bison > - LEX = flex > diff --git a/meta/recipes-kernel/dtc/dtc_git.bb b/meta/recipes-kernel/dtc/dtc_git.bb > index e010488..c205de7 100644 > --- a/meta/recipes-kernel/dtc/dtc_git.bb > +++ b/meta/recipes-kernel/dtc/dtc_git.bb > @@ -3,14 +3,10 @@ require dtc.inc > LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ > file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" > > -SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" > +SRCREV = "033089f29099bdfd5c2d6986cdb9fd07b16cfde0" > PV = "1.3.0+git${SRCPV}" > -PR = "${INC_PR}.0" > +PR = "${INC_PR}.1" > > S = "${WORKDIR}/git" > > -SRC_URI_PATCH = " file://remove_space_opt.patch" > -SRC_URI_PATCH_virtclass-native = "" > -SRC_URI += "${SRC_URI_PATCH}" > - > -BBCLASSEXTEND = "native" > +BBCLASSEXTEND = "native nativesdk" Merged v2 into OE-Core Thanks Sau!