summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/dtc/dtc-native.inc3
-rw-r--r--meta/recipes-kernel/dtc/dtc-native_git.bb5
-rw-r--r--meta/recipes-kernel/dtc/dtc.inc8
-rw-r--r--meta/recipes-kernel/dtc/dtc/remove_space_opt.patch2
-rw-r--r--meta/recipes-kernel/dtc/dtc_git.bb15
-rw-r--r--meta/recipes-kernel/dtc/dtc_git.inc8
6 files changed, 21 insertions, 20 deletions
diff --git a/meta/recipes-kernel/dtc/dtc-native.inc b/meta/recipes-kernel/dtc/dtc-native.inc
deleted file mode 100644
index 1da7004316..0000000000
--- a/meta/recipes-kernel/dtc/dtc-native.inc
+++ /dev/null
@@ -1,3 +0,0 @@
1require dtc.inc
2
3inherit native
diff --git a/meta/recipes-kernel/dtc/dtc-native_git.bb b/meta/recipes-kernel/dtc/dtc-native_git.bb
deleted file mode 100644
index fd5bde5765..0000000000
--- a/meta/recipes-kernel/dtc/dtc-native_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
2 file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
3
4require dtc-native.inc
5require dtc_git.inc
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index e068df3c73..cfed15a4c5 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -2,7 +2,7 @@ SUMMARY = "Device Tree Compiler"
2DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels." 2DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels."
3SECTION = "bootloader" 3SECTION = "bootloader"
4PRIORITY = "optional" 4PRIORITY = "optional"
5LICENSE = "GPL" 5LICENSE = "GPL2 | BSD"
6DEPENDS = "flex-native bison-native" 6DEPENDS = "flex-native bison-native"
7 7
8inherit autotools 8inherit autotools
@@ -11,3 +11,9 @@ do_install() {
11 install -m 0755 -d ${D}${bindir} 11 install -m 0755 -d ${D}${bindir}
12 install -m 755 dtc ${D}${bindir}/dtc 12 install -m 755 dtc ${D}${bindir}/dtc
13} 13}
14SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
15 file://fix_for_compilation_with_gcc_4.6.0.patch"
16
17INC_PR = "r0"
18
19S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch b/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
index 805bf58796..8c26deca35 100644
--- a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
+++ b/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
@@ -1,5 +1,7 @@
1Remove the -Os flag 1Remove the -Os flag
2 2
3Upstream-Status: Inappropriate [configuration]
4
3Signed-off-by: Saul Wold <sgw@linux.intel.com> 5Signed-off-by: Saul Wold <sgw@linux.intel.com>
4Index: git/Makefile 6Index: git/Makefile
5=================================================================== 7===================================================================
diff --git a/meta/recipes-kernel/dtc/dtc_git.bb b/meta/recipes-kernel/dtc/dtc_git.bb
index 1cca32cedb..e010488dd8 100644
--- a/meta/recipes-kernel/dtc/dtc_git.bb
+++ b/meta/recipes-kernel/dtc/dtc_git.bb
@@ -1,7 +1,16 @@
1require dtc.inc 1require dtc.inc
2require dtc_git.inc 2
3LICENSE="GPLv2|BSD"
4LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ 3LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
5 file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" 4 file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
6 5
7SRC_URI += " file://remove_space_opt.patch" 6SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
7PV = "1.3.0+git${SRCPV}"
8PR = "${INC_PR}.0"
9
10S = "${WORKDIR}/git"
11
12SRC_URI_PATCH = " file://remove_space_opt.patch"
13SRC_URI_PATCH_virtclass-native = ""
14SRC_URI += "${SRC_URI_PATCH}"
15
16BBCLASSEXTEND = "native"
diff --git a/meta/recipes-kernel/dtc/dtc_git.inc b/meta/recipes-kernel/dtc/dtc_git.inc
deleted file mode 100644
index 2400cfe52f..0000000000
--- a/meta/recipes-kernel/dtc/dtc_git.inc
+++ /dev/null
@@ -1,8 +0,0 @@
1SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
2 file://fix_for_compilation_with_gcc_4.6.0.patch"
3
4SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
5PV = "1.2.0+git${SRCPV}"
6PR = "r3"
7
8S = "${WORKDIR}/git"