[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-144-gfd9c1f6

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, buildroot-update has been updated
       via  fd9c1f676e700128a8a16ee247b0e6630274b349 (commit)
       via  ab43b6c9acb74176c2e7fad5446363e6f3221b3e (commit)
       via  1534dbd24ec150b249bcf83762aa5a639323d4ff (commit)
      from  26f2614f84f30834db73268ed6f6b4f9106c888a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fd9c1f676e700128a8a16ee247b0e6630274b349
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Fri Oct 28 19:41:27 2016 +0200

    [AS_DEVICES] fixes compilation warnings

commit ab43b6c9acb74176c2e7fad5446363e6f3221b3e
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Thu Oct 27 17:53:11 2016 +0200

    [BUILDROOT] apf-config: bump to latest version and remove lua dependency

commit 1534dbd24ec150b249bcf83762aa5a639323d4ff
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Thu Oct 27 11:39:45 2016 +0200

    [BUILDROOT] opos6ul: fill in genimage.cfg to generate user data partition image

-----------------------------------------------------------------------

Summary of changes:
 .../target/device/armadeus/opos6ul/genimage.cfg    |   28 +++++++++++++++++++-
 .../025-armadeus-apf-config-add-package.patch      |    7 ++---
 target/packages/as_devices/c/as_tcs3472.c          |    1 +
 target/packages/as_devices/python/Makefile         |    3 +-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/buildroot/target/device/armadeus/opos6ul/genimage.cfg b/buildroot/target/device/armadeus/opos6ul/genimage.cfg
index cfe009f..41d8f3a 100644
--- a/buildroot/target/device/armadeus/opos6ul/genimage.cfg
+++ b/buildroot/target/device/armadeus/opos6ul/genimage.cfg
@@ -1 +1,27 @@
-# OPOS6UL image format
+# Image for the OPOS6UL eMMC "User Data" partition
+#
+# For details about the layout, see:
+# http://www.armadeus.org/wiki/index.php?title=EMMC_OPOS6UL
+
+image opos6ul-user_data.ext4 {
+	hdimage {
+	}
+
+	partition failsafe {
+		partition-type = 0x83
+		offset = 1M
+		image = "rootfs.ext4"
+		size = 128M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 2G
+	}
+
+	partition home {
+		partition-type = 0x83
+		size = 1540M
+	}
+}
diff --git a/patches/buildroot/2016.08/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2016.08/025-armadeus-apf-config-add-package.patch
index fdda3c3..05349b9 100644
--- a/patches/buildroot/2016.08/025-armadeus-apf-config-add-package.patch
+++ b/patches/buildroot/2016.08/025-armadeus-apf-config-add-package.patch
@@ -4,7 +4,7 @@ Index: buildroot/package/apf-config/Config.in
 ===================================================================
 --- /dev/null
 +++ buildroot/package/apf-config/Config.in
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,19 @@
 +config BR2_PACKAGE_APF_CONFIG
 +	bool "apf-config"
 +	depends on BR2_USE_WCHAR	# e2fsprogs
@@ -16,7 +16,6 @@ Index: buildroot/package/apf-config/Config.in
 +	select BR2_PACKAGE_E2FSPROGS_E2FSCK
 +	select BR2_PACKAGE_E2FSPROGS_RESIZE2FS
 +	select BR2_PACKAGE_UTIL_LINUX	# fdisk
-+	select BR2_PACKAGE_LUA
 +	help
 +	  Configuration tool for Armadeus APF6 modules
 +	  (à la raspi-config).
@@ -36,11 +35,11 @@ Index: buildroot/package/apf-config/apf-config.mk
 +#
 +################################################################################
 +
-+APF_CONFIG_VERSION = 044378fc0f7b66bb6c66910f75abd49a9a29dfbc
++APF_CONFIG_VERSION = 38daba82d7dfe0caee523417609a5525303147c4
 +APF_CONFIG_SITE = $(call github,artemysfr,raspi-config,$(APF_CONFIG_VERSION))
 +APF_CONFIG_LICENSE = MIT
 +APF_CONFIG_LICENSE_FILES = LICENSE
-+APF_CONFIG_DEPENDENCIES = e2fsprogs lua newt ncurses util-linux
++APF_CONFIG_DEPENDENCIES = e2fsprogs newt ncurses util-linux
 +
 +define APF_CONFIG_INSTALL_TARGET_CMDS
 +	$(INSTALL) -D -m 755 $(@D)/apf-config $(TARGET_DIR)/usr/sbin/apf-config
diff --git a/target/packages/as_devices/c/as_tcs3472.c b/target/packages/as_devices/c/as_tcs3472.c
index 001b95e..ee7e088 100644
--- a/target/packages/as_devices/c/as_tcs3472.c
+++ b/target/packages/as_devices/c/as_tcs3472.c
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>	/* nanosleep */
 
 #include "as_tcs3472.h"
 
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index 1171e6b..b81b252 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -22,10 +22,11 @@ WRAPPER_LIBS += AsI2c_wrap.so
 WRAPPER_LIBS += AsSpi_wrap.so
 WRAPPER_DIR = src
 
+STAGING_DIR = $(ARMADEUS_STAGING_DIR)
 PYTHON_VERS = 2.7
 PYTHON_SUBVERS = 5
 PYINC = $(STAGING_DIR)/usr/include/python$(PYTHON_VERS)/
-PYLIB = $(ARMADEUS_TARGET_DIR)/usr/lib/python$(PYTHON_VERS)
+PYLIB = $(STAGING_DIR)/usr/lib/python$(PYTHON_VERS)
 
 .PHONY: all
 


hooks/post-receive
-- 
armadeus