Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/2] Add imx-kobs package
@ 2015-09-21 12:51 Gary Bisson
  2015-09-21 12:51 ` [Buildroot] [PATCH 1/2] imx-kobs: add new package Gary Bisson
  2015-09-21 12:51 ` [Buildroot] [PATCH 2/2] kobs-ng: remove obsolete package Gary Bisson
  0 siblings, 2 replies; 6+ messages in thread
From: Gary Bisson @ 2015-09-21 12:51 UTC (permalink / raw)
  To: buildroot

Hi all,

This series adds the up to date imx-kobs package and deperecate the old
kobs-ng.

It also includes a patch to allow building this tool on musl as suggested
by Thomas:
http://lists.busybox.net/pipermail/buildroot/2015-September/139899.html

This patch will be submitted to the yocto mailing list (soone) to hopefully
get the attention of the actual imx-kobs package maintainer but I have little
to no hope that they will merge it into their code base as most Freescale
packages require glibc. I'll respond to this e-mail once the patch has been
submitted.

Regards,
Gary

Gary Bisson (2):
  imx-kobs: add new package
  kobs-ng: remove obsolete package

 Config.in.legacy                                   |  8 +++
 package/Config.in                                  |  1 -
 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 ++++
 package/kobs-ng/0001-fix-mtd-defines.patch         | 73 ----------------------
 package/kobs-ng/Config.in                          |  9 ---
 package/kobs-ng/kobs-ng.hash                       |  2 -
 package/kobs-ng/kobs-ng.mk                         | 13 ----
 11 files changed, 76 insertions(+), 98 deletions(-)
 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
 delete mode 100644 package/kobs-ng/0001-fix-mtd-defines.patch
 delete mode 100644 package/kobs-ng/Config.in
 delete mode 100644 package/kobs-ng/kobs-ng.hash
 delete mode 100644 package/kobs-ng/kobs-ng.mk

-- 
2.5.1

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] imx-kobs: add new package
  2015-09-21 12:51 [Buildroot] [PATCH 0/2] Add imx-kobs package Gary Bisson
@ 2015-09-21 12:51 ` Gary Bisson
  2015-09-21 17:23   ` Arnout Vandecappelle
  2015-09-21 12:51 ` [Buildroot] [PATCH 2/2] kobs-ng: remove obsolete package Gary Bisson
  1 sibling, 1 reply; 6+ messages in thread
From: Gary Bisson @ 2015-09-21 12:51 UTC (permalink / raw)
  To: buildroot

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__)
++#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))
-- 
2.5.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] kobs-ng: remove obsolete package
  2015-09-21 12:51 [Buildroot] [PATCH 0/2] Add imx-kobs package Gary Bisson
  2015-09-21 12:51 ` [Buildroot] [PATCH 1/2] imx-kobs: add new package Gary Bisson
@ 2015-09-21 12:51 ` Gary Bisson
  2015-09-21 17:23   ` Arnout Vandecappelle
  1 sibling, 1 reply; 6+ messages in thread
From: Gary Bisson @ 2015-09-21 12:51 UTC (permalink / raw)
  To: buildroot

In favor of imx-kobs maintained by Freescale.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 Config.in.legacy                           |  8 ++++
 package/Config.in                          |  1 -
 package/kobs-ng/0001-fix-mtd-defines.patch | 73 ------------------------------
 package/kobs-ng/Config.in                  |  9 ----
 package/kobs-ng/kobs-ng.hash               |  2 -
 package/kobs-ng/kobs-ng.mk                 | 13 ------
 6 files changed, 8 insertions(+), 98 deletions(-)
 delete mode 100644 package/kobs-ng/0001-fix-mtd-defines.patch
 delete mode 100644 package/kobs-ng/Config.in
 delete mode 100644 package/kobs-ng/kobs-ng.hash
 delete mode 100644 package/kobs-ng/kobs-ng.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 18231fd..5305538 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -363,6 +363,14 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW
 	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
 	  examples.
 
+config BR2_PACKAGE_KOBS_NG
+	bool "kobs-ng was replaced by imx-kobs"
+	select BR2_LEGACY
+	select BR2_PACKAGE_IMX_KOBS
+	help
+	  The outdated kobs-ng has been replaced by the Freescale-
+	  maintained imx-kobs package.
+
 config BR2_PACKAGE_SAWMAN
 	bool "sawman package removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 22aef52..5c4c3b4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -164,7 +164,6 @@ menu "Filesystem and flash utilities"
 	source "package/genext2fs/Config.in"
 	source "package/genpart/Config.in"
 	source "package/genromfs/Config.in"
-	source "package/kobs-ng/Config.in"
 	source "package/makedevs/Config.in"
 	source "package/mmc-utils/Config.in"
 	source "package/mtd/Config.in"
diff --git a/package/kobs-ng/0001-fix-mtd-defines.patch b/package/kobs-ng/0001-fix-mtd-defines.patch
deleted file mode 100644
index 3ffba71..0000000
--- a/package/kobs-ng/0001-fix-mtd-defines.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Newer kernel headers renamed mtd mode defines and no longer support
-MEMSETOOBSEL. Allow code to work with both older and newer kernel
-versions.
-
-Signed-off-by: Paul B. Henson <henson@acm.org>
-Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com>
-
-diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c
---- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c	2012-12-17 22:37:40.000000000 -0800
-+++ kobs-ng-3.0.35-4.0.0/src/mtd.c	2013-07-28 19:39:59.000000000 -0700
-@@ -852,8 +852,11 @@
- 		mp = &md->part[i];
- 
- 		if (mp->fd != -1) {
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- 			(void)ioctl(mp->fd, MEMSETOOBSEL,
- 					&mp->old_oobinfo);
-+#endif
- 			close(mp->fd);
- 		}
- 
-@@ -896,6 +899,8 @@
- 				continue;
- 			}
- 
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- 			if (r == -ENOTTY) {
- 				r = ioctl(mp->fd, MEMSETOOBSEL, &mp->old_oobinfo);
- 				if (r != 0) {
-@@ -904,6 +909,7 @@
- 				}
- 				mp->oobinfochanged = 0;
- 			}
-+#endif
- 		} else {
- 			r = ioctl(mp->fd, MTDFILEMODE, (void *)MTD_MODE_RAW);
- 			if (r != 0 && r != -ENOTTY) {
-@@ -911,6 +917,8 @@
- 				continue;
- 			}
- 
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- 			if (r == -ENOTTY) {
- 				r = ioctl(mp->fd, MEMSETOOBSEL, &none_oobinfo);
- 				if (r != 0) {
-@@ -920,6 +928,7 @@
- 				mp->oobinfochanged = 1;
- 			} else
- 				mp->oobinfochanged = 2;
-+#endif
- 		}
- 
- 		mp->ecc = ecc;
-diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h
---- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h	2012-12-17 22:37:40.000000000 -0800
-+++ kobs-ng-3.0.35-4.0.0/src/mtd.h	2013-07-28 19:33:57.000000000 -0700
-@@ -31,6 +31,13 @@
- #include "BootControlBlocks.h"
- #include "rom_nand_hamming_code_ecc.h"
- 
-+// Newer kernel headers renamed define
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL
-+# define MTD_MODE_RAW MTD_FILE_MODE_RAW
-+#endif
-+
- //------------------------------------------------------------------------------
- // Re-definitions of true and false, because the standard ones aren't good
- // enough?
diff --git a/package/kobs-ng/Config.in b/package/kobs-ng/Config.in
deleted file mode 100644
index 1f6b2d1..0000000
--- a/package/kobs-ng/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_KOBS_NG
-	bool "kobs-ng"
-	depends on BR2_arm
-	help
-	  The kobs-ng tool is used for writing images to NAND on i.MX
-	  platforms.
-
-	  This utility is provided by Freescale as-is and doesn't have an
-	  upstream.
diff --git a/package/kobs-ng/kobs-ng.hash b/package/kobs-ng/kobs-ng.hash
deleted file mode 100644
index 3e527da..0000000
--- a/package/kobs-ng/kobs-ng.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-3.0.35-4.0.0/kobs-ng-3.0.35-4.0.0.tar.gz.md5sum
-md5	26104c577f59a6b81782a5bd16aadd82	kobs-ng-3.0.35-4.0.0.tar.gz
diff --git a/package/kobs-ng/kobs-ng.mk b/package/kobs-ng/kobs-ng.mk
deleted file mode 100644
index 13d1faf..0000000
--- a/package/kobs-ng/kobs-ng.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# kobs-ng
-#
-################################################################################
-
-# kobs-ng versions have never made much sense :(
-KOBS_NG_VERSION = 3.0.35-4.0.0
-KOBS_NG_SITE = http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-$(KOBS_NG_VERSION)
-KOBS_NG_LICENSE = GPLv2+
-KOBS_NG_LICENSE_FILES = COPYING
-
-$(eval $(autotools-package))
-- 
2.5.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] imx-kobs: add new package
  2015-09-21 12:51 ` [Buildroot] [PATCH 1/2] imx-kobs: add new package Gary Bisson
@ 2015-09-21 17:23   ` Arnout Vandecappelle
  2015-09-22 17:02     ` Gary Bisson
  0 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-09-21 17:23 UTC (permalink / raw)
  To: buildroot

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]


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] kobs-ng: remove obsolete package
  2015-09-21 12:51 ` [Buildroot] [PATCH 2/2] kobs-ng: remove obsolete package Gary Bisson
@ 2015-09-21 17:23   ` Arnout Vandecappelle
  0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-09-21 17:23 UTC (permalink / raw)
  To: buildroot

On 21-09-15 14:51, Gary Bisson wrote:
> In favor of imx-kobs maintained by Freescale.
> 
> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

[snip]

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] imx-kobs: add new package
  2015-09-21 17:23   ` Arnout Vandecappelle
@ 2015-09-22 17:02     ` Gary Bisson
  0 siblings, 0 replies; 6+ messages in thread
From: Gary Bisson @ 2015-09-22 17:02 UTC (permalink / raw)
  To: buildroot

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-09-22 17:02 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21 12:51 [Buildroot] [PATCH 0/2] Add imx-kobs package Gary Bisson
2015-09-21 12:51 ` [Buildroot] [PATCH 1/2] imx-kobs: add new package Gary Bisson
2015-09-21 17:23   ` Arnout Vandecappelle
2015-09-22 17:02     ` Gary Bisson
2015-09-21 12:51 ` [Buildroot] [PATCH 2/2] kobs-ng: remove obsolete package Gary Bisson
2015-09-21 17:23   ` Arnout Vandecappelle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox