diff options
-rw-r--r-- | meta/recipes-kernel/dtc/dtc.inc | 12 | ||||
-rw-r--r-- | meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch | 51 | ||||
-rw-r--r-- | meta/recipes-kernel/dtc/dtc/remove_space_opt.patch | 18 | ||||
-rw-r--r-- | meta/recipes-kernel/dtc/dtc_git.bb | 10 |
4 files changed, 9 insertions, 82 deletions
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc index eae46ac2d7..0f45d5f08e 100644 --- a/meta/recipes-kernel/dtc/dtc.inc +++ b/meta/recipes-kernel/dtc/dtc.inc | |||
@@ -6,13 +6,13 @@ DEPENDS = "flex-native bison-native" | |||
6 | 6 | ||
7 | inherit autotools | 7 | inherit autotools |
8 | 8 | ||
9 | do_install() { | ||
10 | install -m 0755 -d ${D}${bindir} | ||
11 | install -m 755 dtc ${D}${bindir}/dtc | ||
12 | } | ||
13 | SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \ | 9 | SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \ |
14 | file://fix_for_compilation_with_gcc_4.6.0.patch" | 10 | " |
15 | 11 | ||
16 | INC_PR = "r0" | 12 | EXTRA_OEMAKE='PREFIX="${prefix}"' |
13 | INC_PR = "r1" | ||
17 | 14 | ||
18 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | |||
17 | PACKAGES =+ "${PN}-misc" | ||
18 | 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 b34894d926..0000000000 --- a/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix following compilation errors with gcc 4.6.0 | ||
4 | | dtc.c: In function 'main': | ||
5 | | dtc.c:100:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable] | ||
6 | | cc1: all warnings being treated as errors | ||
7 | | | ||
8 | | make: *** [dtc.o] Error 1 | ||
9 | | make: *** Waiting for unfinished jobs.... | ||
10 | | flattree.c: In function 'flat_read_mem_reserve': | ||
11 | | flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable] | ||
12 | | cc1: all warnings being treated as errors | ||
13 | | | ||
14 | | make: *** [flattree.o] Error 1 | ||
15 | | ERROR: oe_runmake failed | ||
16 | |||
17 | Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 | ||
18 | |||
19 | Index: git/dtc.c | ||
20 | =================================================================== | ||
21 | --- git.orig/dtc.c | ||
22 | +++ git/dtc.c | ||
23 | @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) | ||
24 | const char *inform = "dts"; | ||
25 | const char *outform = "dts"; | ||
26 | const char *outname = "-"; | ||
27 | - int force = 0, check = 0; | ||
28 | + int force = 0, __attribute__((__unused__)) check = 0; | ||
29 | const char *arg; | ||
30 | int opt; | ||
31 | FILE *outf = NULL; | ||
32 | Index: git/flattree.c | ||
33 | =================================================================== | ||
34 | --- git.orig/flattree.c | ||
35 | +++ git/flattree.c | ||
36 | @@ -697,7 +697,6 @@ static struct reserve_info *flat_read_me | ||
37 | { | ||
38 | struct reserve_info *reservelist = NULL; | ||
39 | struct reserve_info *new; | ||
40 | - const char *p; | ||
41 | struct fdt_reserve_entry re; | ||
42 | |||
43 | /* | ||
44 | @@ -706,7 +705,6 @@ static struct reserve_info *flat_read_me | ||
45 | * | ||
46 | * First pass, count entries. | ||
47 | */ | ||
48 | - p = inb->ptr; | ||
49 | while (1) { | ||
50 | flat_read_chunk(inb, &re, sizeof(re)); | ||
51 | 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 8c26deca35..0000000000 --- a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Remove the -Os flag | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | Index: git/Makefile | ||
7 | =================================================================== | ||
8 | --- git.orig/Makefile | ||
9 | +++ git/Makefile | ||
10 | @@ -18,7 +18,7 @@ CONFIG_LOCALVERSION = | ||
11 | CPPFLAGS = -I libfdt | ||
12 | WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ | ||
13 | -Wstrict-prototypes -Wmissing-prototypes | ||
14 | -CFLAGS = -g -Os -fPIC -Werror $(WARNINGS) | ||
15 | +CFLAGS = -g -fPIC -Werror $(WARNINGS) | ||
16 | |||
17 | BISON = bison | ||
18 | LEX = flex | ||
diff --git a/meta/recipes-kernel/dtc/dtc_git.bb b/meta/recipes-kernel/dtc/dtc_git.bb index e010488dd8..c205de7023 100644 --- a/meta/recipes-kernel/dtc/dtc_git.bb +++ b/meta/recipes-kernel/dtc/dtc_git.bb | |||
@@ -3,14 +3,10 @@ require dtc.inc | |||
3 | LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ | 3 | LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ |
4 | file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" | 4 | file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" |
5 | 5 | ||
6 | SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" | 6 | SRCREV = "033089f29099bdfd5c2d6986cdb9fd07b16cfde0" |
7 | PV = "1.3.0+git${SRCPV}" | 7 | PV = "1.3.0+git${SRCPV}" |
8 | PR = "${INC_PR}.0" | 8 | PR = "${INC_PR}.1" |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
12 | SRC_URI_PATCH = " file://remove_space_opt.patch" | 12 | BBCLASSEXTEND = "native nativesdk" |
13 | SRC_URI_PATCH_virtclass-native = "" | ||
14 | SRC_URI += "${SRC_URI_PATCH}" | ||
15 | |||
16 | BBCLASSEXTEND = "native" | ||