diff mbox

[1/2] imx-kobs: add new package

Message ID 1442839899-18044-2-git-send-email-gary.bisson@boundarydevices.com
State Superseded
Headers show

Commit Message

Gary Bisson Sept. 21, 2015, 12:51 p.m. UTC 
Based on the Yocto 3.14.28-1.0.0_ga update:
https://github.com/Freescale/meta-fsl-arm/commit/6c44744

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 package/freescale-imx/Config.in                    |  1 +
 .../imx-kobs/0001-Fix-musl-build.patch             | 43 ++++++++++++++++++++++
 package/freescale-imx/imx-kobs/Config.in           | 10 +++++
 package/freescale-imx/imx-kobs/imx-kobs.hash       |  2 +
 package/freescale-imx/imx-kobs/imx-kobs.mk         | 12 ++++++
 5 files changed, 68 insertions(+)
 create mode 100644 package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
 create mode 100644 package/freescale-imx/imx-kobs/Config.in
 create mode 100644 package/freescale-imx/imx-kobs/imx-kobs.hash
 create mode 100644 package/freescale-imx/imx-kobs/imx-kobs.mk

Comments

Arnout Vandecappelle Sept. 21, 2015, 5:23 p.m. UTC | #1 
On 21-09-15 14:51, Gary Bisson wrote:
> Based on the Yocto 3.14.28-1.0.0_ga update:
> https://github.com/Freescale/meta-fsl-arm/commit/6c44744
> 
> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
> ---
>  package/freescale-imx/Config.in                    |  1 +
>  .../imx-kobs/0001-Fix-musl-build.patch             | 43 ++++++++++++++++++++++
>  package/freescale-imx/imx-kobs/Config.in           | 10 +++++
>  package/freescale-imx/imx-kobs/imx-kobs.hash       |  2 +
>  package/freescale-imx/imx-kobs/imx-kobs.mk         | 12 ++++++
>  5 files changed, 68 insertions(+)
>  create mode 100644 package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
>  create mode 100644 package/freescale-imx/imx-kobs/Config.in
>  create mode 100644 package/freescale-imx/imx-kobs/imx-kobs.hash
>  create mode 100644 package/freescale-imx/imx-kobs/imx-kobs.mk
> 
> diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
> index dffe76f..a958dbd 100644
> --- a/package/freescale-imx/Config.in
> +++ b/package/freescale-imx/Config.in
> @@ -42,6 +42,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
>  	default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
>  	default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
>  
> +source "package/freescale-imx/imx-kobs/Config.in"
>  source "package/freescale-imx/imx-lib/Config.in"
>  source "package/freescale-imx/imx-vpu/Config.in"
>  source "package/freescale-imx/firmware-imx/Config.in"
> diff --git a/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
> new file mode 100644
> index 0000000..4e9c72b
> --- /dev/null
> +++ b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
> @@ -0,0 +1,43 @@
> +[PATCH] Fix musl build
> +
> +Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
> +---
> + src/mtd.c | 5 +++++
> + src/mtd.h | 5 +++++
> + 2 files changed, 10 insertions(+)
> +
> +diff --git a/src/mtd.c b/src/mtd.c
> +index 1edc441..2d3824e 100644
> +--- a/src/mtd.c
> ++++ b/src/mtd.c
> +@@ -34,6 +34,11 @@
> + #include <sys/types.h>
> + #include <sys/ioctl.h>
> + 
> ++// musl offsetof macro is located in stddef.h
> ++#if !defined(__GLIBC__) && !defined(__UCLIBC__)

 Since C99 (and probably C90 as well) specifies that offsetof is in stddef.h, I
don't think it's necessary to do this conditionally.

 Regards,
 Arnout

> ++#include <stddef.h>
> ++#endif
> ++
> + #include "mtd.h"
> + #include "rand.h"
> + 
[snip]
Gary Bisson Sept. 22, 2015, 5:02 p.m. UTC | #2 
Hi Arnout,

On Mon, Sep 21, 2015 at 7:23 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 21-09-15 14:51, Gary Bisson wrote:
>> Based on the Yocto 3.14.28-1.0.0_ga update:
>> https://github.com/Freescale/meta-fsl-arm/commit/6c44744
>>
>> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
>> ---
>>  package/freescale-imx/Config.in                    |  1 +
>>  .../imx-kobs/0001-Fix-musl-build.patch             | 43 ++++++++++++++++++++++
>>  package/freescale-imx/imx-kobs/Config.in           | 10 +++++
>>  package/freescale-imx/imx-kobs/imx-kobs.hash       |  2 +
>>  package/freescale-imx/imx-kobs/imx-kobs.mk         | 12 ++++++
>>  5 files changed, 68 insertions(+)
>>  create mode 100644 package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
>>  create mode 100644 package/freescale-imx/imx-kobs/Config.in
>>  create mode 100644 package/freescale-imx/imx-kobs/imx-kobs.hash
>>  create mode 100644 package/freescale-imx/imx-kobs/imx-kobs.mk
>>
>> diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
>> index dffe76f..a958dbd 100644
>> --- a/package/freescale-imx/Config.in
>> +++ b/package/freescale-imx/Config.in
>> @@ -42,6 +42,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
>>       default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
>>       default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
>>
>> +source "package/freescale-imx/imx-kobs/Config.in"
>>  source "package/freescale-imx/imx-lib/Config.in"
>>  source "package/freescale-imx/imx-vpu/Config.in"
>>  source "package/freescale-imx/firmware-imx/Config.in"
>> diff --git a/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
>> new file mode 100644
>> index 0000000..4e9c72b
>> --- /dev/null
>> +++ b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
>> @@ -0,0 +1,43 @@
>> +[PATCH] Fix musl build
>> +
>> +Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
>> +---
>> + src/mtd.c | 5 +++++
>> + src/mtd.h | 5 +++++
>> + 2 files changed, 10 insertions(+)
>> +
>> +diff --git a/src/mtd.c b/src/mtd.c
>> +index 1edc441..2d3824e 100644
>> +--- a/src/mtd.c
>> ++++ b/src/mtd.c
>> +@@ -34,6 +34,11 @@
>> + #include <sys/types.h>
>> + #include <sys/ioctl.h>
>> +
>> ++// musl offsetof macro is located in stddef.h
>> ++#if !defined(__GLIBC__) && !defined(__UCLIBC__)
>
>  Since C99 (and probably C90 as well) specifies that offsetof is in stddef.h, I
> don't think it's necessary to do this conditionally.

You're right. I just didn't think it through, when the build
complained at offsetof I just looked at its location in the musl
toolchain.

I'll submit a V2 soon. Thanks for the feedback.

Regards,
Gary
diff mbox

Patch

diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index dffe76f..a958dbd 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -42,6 +42,7 @@  config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
 	default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
 	default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
 
+source "package/freescale-imx/imx-kobs/Config.in"
 source "package/freescale-imx/imx-lib/Config.in"
 source "package/freescale-imx/imx-vpu/Config.in"
 source "package/freescale-imx/firmware-imx/Config.in"
diff --git a/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
new file mode 100644
index 0000000..4e9c72b
--- /dev/null
+++ b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
@@ -0,0 +1,43 @@ 
+[PATCH] Fix musl build
+
+Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
+---
+ src/mtd.c | 5 +++++
+ src/mtd.h | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/mtd.c b/src/mtd.c
+index 1edc441..2d3824e 100644
+--- a/src/mtd.c
++++ b/src/mtd.c
+@@ -34,6 +34,11 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ 
++// musl offsetof macro is located in stddef.h
++#if !defined(__GLIBC__) && !defined(__UCLIBC__)
++#include <stddef.h>
++#endif
++
+ #include "mtd.h"
+ #include "rand.h"
+ 
+diff --git a/src/mtd.h b/src/mtd.h
+index bd21add..debfc84 100644
+--- a/src/mtd.h
++++ b/src/mtd.h
+@@ -31,6 +31,11 @@
+ #include "BootControlBlocks.h"
+ #include "rom_nand_hamming_code_ecc.h"
+ 
++// musl library doesn't define loff_t
++#if !defined(__GLIBC__) && !defined(__UCLIBC__)
++#define loff_t off_t
++#endif
++
+ //------------------------------------------------------------------------------
+ // Re-definitions of true and false, because the standard ones aren't good
+ // enough?
+-- 
+2.5.1
+
diff --git a/package/freescale-imx/imx-kobs/Config.in b/package/freescale-imx/imx-kobs/Config.in
new file mode 100644
index 0000000..fc2344e
--- /dev/null
+++ b/package/freescale-imx/imx-kobs/Config.in
@@ -0,0 +1,10 @@ 
+config BR2_PACKAGE_IMX_KOBS
+	bool "imx-kobs"
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  The imx-kobs tool is used for writing images to NAND on i.MX
+	  platforms.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
+
diff --git a/package/freescale-imx/imx-kobs/imx-kobs.hash b/package/freescale-imx/imx-kobs/imx-kobs.hash
new file mode 100644
index 0000000..13373ea
--- /dev/null
+++ b/package/freescale-imx/imx-kobs/imx-kobs.hash
@@ -0,0 +1,2 @@ 
+# locally computed
+sha256 cfac042f5c96731205c397a4a6b3ed966f804569ae4d0e2685d22fdf6bdc9eb7  imx-kobs-3.14.28-1.0.0.tar.gz
diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk
new file mode 100644
index 0000000..02c5cad
--- /dev/null
+++ b/package/freescale-imx/imx-kobs/imx-kobs.mk
@@ -0,0 +1,12 @@ 
+################################################################################
+#
+# imx-kobs
+#
+################################################################################
+
+IMX_KOBS_VERSION = $(FREESCALE_IMX_VERSION)
+IMX_KOBS_SITE = $(FREESCALE_IMX_SITE)
+IMX_KOBS_LICENSE = GPLv2+
+IMX_KOBS_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))