summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image_types.bbclass2
-rw-r--r--meta/classes/kernel-fitimage.bbclass2
-rw-r--r--meta/classes/kernel-uimage.bbclass2
-rw-r--r--meta/conf/distro/include/distro_alias.inc2
-rw-r--r--meta/conf/distro/include/maintainers.inc2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools_2018.07.bb (renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb)27
6 files changed, 30 insertions, 7 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 05e5b0a2e0..5c406481ef 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -308,7 +308,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native"
308CONVERSION_DEPENDS_zip = "zip-native" 308CONVERSION_DEPENDS_zip = "zip-native"
309CONVERSION_DEPENDS_sum = "mtd-utils-native" 309CONVERSION_DEPENDS_sum = "mtd-utils-native"
310CONVERSION_DEPENDS_bmap = "bmap-tools-native" 310CONVERSION_DEPENDS_bmap = "bmap-tools-native"
311CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native" 311CONVERSION_DEPENDS_u-boot = "u-boot-tools-native"
312CONVERSION_DEPENDS_vmdk = "qemu-native" 312CONVERSION_DEPENDS_vmdk = "qemu-native"
313CONVERSION_DEPENDS_vdi = "qemu-native" 313CONVERSION_DEPENDS_vdi = "qemu-native"
314CONVERSION_DEPENDS_qcow2 = "qemu-native" 314CONVERSION_DEPENDS_qcow2 = "qemu-native"
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 4c4fd99ff4..328bef4069 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -4,7 +4,7 @@ python __anonymous () {
4 kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" 4 kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
5 if 'fitImage' in kerneltypes.split(): 5 if 'fitImage' in kerneltypes.split():
6 depends = d.getVar("DEPENDS") 6 depends = d.getVar("DEPENDS")
7 depends = "%s u-boot-mkimage-native dtc-native" % depends 7 depends = "%s u-boot-tools-native dtc-native" % depends
8 d.setVar("DEPENDS", depends) 8 d.setVar("DEPENDS", depends)
9 9
10 uarch = d.getVar("UBOOT_ARCH") 10 uarch = d.getVar("UBOOT_ARCH")
diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass
index c2de6bb40d..cedb4fa070 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -3,7 +3,7 @@ inherit kernel-uboot
3python __anonymous () { 3python __anonymous () {
4 if "uImage" in d.getVar('KERNEL_IMAGETYPES'): 4 if "uImage" in d.getVar('KERNEL_IMAGETYPES'):
5 depends = d.getVar("DEPENDS") 5 depends = d.getVar("DEPENDS")
6 depends = "%s u-boot-mkimage-native" % depends 6 depends = "%s u-boot-tools-native" % depends
7 d.setVar("DEPENDS", depends) 7 d.setVar("DEPENDS", depends)
8 8
9 # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal 9 # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 7502542e89..f23db1e8a4 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -354,7 +354,7 @@ DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/"
354DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera" 354DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera"
355DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" 355DISTRO_PN_ALIAS_pn-tzcode = "OSPDT"
356DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools" 356DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools"
357DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage Debian=uboot-mkimage" 357DISTRO_PN_ALIAS_pn-u-boot-tools = "Ubuntu=u-boot-tools Debian=uboot-tools"
358DISTRO_PN_ALIAS_pn-udev = "Mandriva=udev Fedora=udev" 358DISTRO_PN_ALIAS_pn-udev = "Mandriva=udev Fedora=udev"
359DISTRO_PN_ALIAS_pn-udev-extraconf = "OE-Core" 359DISTRO_PN_ALIAS_pn-udev-extraconf = "OE-Core"
360DISTRO_PN_ALIAS_pn-unfs3 = "Debian=unfs3 Fedora=unfs3" 360DISTRO_PN_ALIAS_pn-unfs3 = "Debian=unfs3 Fedora=unfs3"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 05a2c9f38a..8a4362d947 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -656,7 +656,7 @@ RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster <akuster808@gmail.com>"
656RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <akuster808@gmail.com>" 656RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <akuster808@gmail.com>"
657RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut <marek.vasut@gmail.com>" 657RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut <marek.vasut@gmail.com>"
658RECIPE_MAINTAINER_pn-u-boot-fw-utils = "Marek Vasut <marek.vasut@gmail.com>" 658RECIPE_MAINTAINER_pn-u-boot-fw-utils = "Marek Vasut <marek.vasut@gmail.com>"
659RECIPE_MAINTAINER_pn-u-boot-mkimage = "Marek Vasut <marek.vasut@gmail.com>" 659RECIPE_MAINTAINER_pn-u-boot-tools = "Marek Vasut <marek.vasut@gmail.com>"
660RECIPE_MAINTAINER_pn-udev-extraconf = "Ross Burton <ross.burton@intel.com>" 660RECIPE_MAINTAINER_pn-udev-extraconf = "Ross Burton <ross.burton@intel.com>"
661RECIPE_MAINTAINER_pn-unfs3 = "Ross Burton <ross.burton@intel.com>" 661RECIPE_MAINTAINER_pn-unfs3 = "Ross Burton <ross.burton@intel.com>"
662RECIPE_MAINTAINER_pn-unifdef = "Ross Burton <ross.burton@intel.com>" 662RECIPE_MAINTAINER_pn-unifdef = "Ross Burton <ross.burton@intel.com>"
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2018.07.bb
index 08bff1d161..127c4c15d1 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2018.07.bb
@@ -1,8 +1,18 @@
1require u-boot-common_${PV}.inc 1require u-boot-common_${PV}.inc
2 2
3SUMMARY = "U-Boot bootloader image creation tool" 3SUMMARY = "U-Boot bootloader tools"
4DEPENDS += "openssl" 4DEPENDS += "openssl"
5 5
6PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage"
7PROVIDES_class-native = "u-boot-mkimage-native u-boot-mkenvimage-native"
8
9PACKAGES += "${PN}-mkimage ${PN}-mkenvimage"
10
11# Required for backward compatibility with "u-boot-mkimage-xxx.bb"
12RPROVIDES_${PN}-mkimage = "u-boot-mkimage"
13RREPLACES_${PN}-mkimage = "u-boot-mkimage"
14RCONFLICTS_${PN}-mkimage = "u-boot-mkimage"
15
6EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 16EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
7EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 17EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
8EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 18EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
@@ -20,10 +30,23 @@ do_compile () {
20 30
21do_install () { 31do_install () {
22 install -d ${D}${bindir} 32 install -d ${D}${bindir}
33
34 # mkimage
23 install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage 35 install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
24 ln -sf uboot-mkimage ${D}${bindir}/mkimage 36 ln -sf uboot-mkimage ${D}${bindir}/mkimage
37
38 # mkenvimage
39 install -m 0755 tools/mkenvimage ${D}${bindir}/uboot-mkenvimage
40 ln -sf uboot-mkenvimage ${D}${bindir}/mkenvimage
25} 41}
26 42
27RDEPENDS_${PN} += "dtc" 43ALLOW_EMPTY_${PN} = "1"
44FILES_${PN} = ""
45FILES_${PN}-mkimage = "${bindir}/uboot-mkimage ${bindir}/mkimage"
46FILES_${PN}-mkenvimage = "${bindir}/uboot-mkenvimage ${bindir}/mkenvimage"
47
48RDEPENDS_${PN}-mkimage += "dtc"
49RDEPENDS_${PN} += "${PN}-mkimage ${PN}-mkenvimage"
50RDEPENDS_${PN}_class-native = ""
28 51
29BBCLASSEXTEND = "native nativesdk" 52BBCLASSEXTEND = "native nativesdk"