From b5cd4d7edc0f85374bc89ae8465c7f0fb4b9fc0a Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 19 Nov 2012 13:40:53 +0100 Subject: [PATCH] meta-digi-del: Add distribution layer. This commit separates the BSP layer from the DEL distribution layer. This allows for customers to use the BSP layer while customizing their own distribution, and for other Digi teams, like the gateways, to do the same. It would also allow to use the DEL layer over other BSPs. Signed-off-by: Alex Gonzalez --- README | 6 +- meta-digi-arm/conf/layer.conf | 8 -- meta-digi-del/DIGI_EULA | 90 +++++++++++++++++++ meta-digi-del/DIGI_OPEN_EULA | 75 ++++++++++++++++ meta-digi-del/README | 23 +++++ .../conf/distro/del.conf | 0 meta-digi-del/conf/layer.conf | 19 ++++ .../base-passwd-3.5.24/add-shadow-file.patch | 0 .../base-passwd-3.5.24/base-passwd_3.5.24.bb | 0 .../base-passwd-3.5.24/nobash.patch | 0 .../base-passwd-3.5.24/root-home.patch | 0 .../busybox-1.19.4/busybox_1.19.4.bbappend | 0 .../busybox-1.19.4/files/defconfig-del | 0 .../recipes-core/images/del-image-minimal.bb | 0 .../recipes-core/tasks/task-del-core.bb | 0 15 files changed, 210 insertions(+), 11 deletions(-) create mode 100644 meta-digi-del/DIGI_EULA create mode 100644 meta-digi-del/DIGI_OPEN_EULA create mode 100644 meta-digi-del/README rename {meta-digi-arm => meta-digi-del}/conf/distro/del.conf (100%) create mode 100644 meta-digi-del/conf/layer.conf rename {meta-digi-arm => meta-digi-del}/recipes-core/base-passwd-3.5.24/add-shadow-file.patch (100%) rename {meta-digi-arm => meta-digi-del}/recipes-core/base-passwd-3.5.24/base-passwd_3.5.24.bb (100%) rename {meta-digi-arm => meta-digi-del}/recipes-core/base-passwd-3.5.24/nobash.patch (100%) rename {meta-digi-arm => meta-digi-del}/recipes-core/base-passwd-3.5.24/root-home.patch (100%) rename {meta-digi-arm => meta-digi-del}/recipes-core/busybox-1.19.4/busybox_1.19.4.bbappend (100%) rename {meta-digi-arm => meta-digi-del}/recipes-core/busybox-1.19.4/files/defconfig-del (100%) rename {meta-digi-arm => meta-digi-del}/recipes-core/images/del-image-minimal.bb (100%) rename {meta-digi-arm => meta-digi-del}/recipes-core/tasks/task-del-core.bb (100%) diff --git a/README b/README index 666120a64..d4808feab 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ meta-digi ========= -This is the location for Digi maintained BSPs. +This is the location for Digi maintained layers. -Please see the README files contained in the individual BSP layers for -BSP-specific information. +Please see the README files contained in the individual layers for +specific information. diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf index eff39fa07..8756bfb68 100644 --- a/meta-digi-arm/conf/layer.conf +++ b/meta-digi-arm/conf/layer.conf @@ -3,14 +3,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}" BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -# [DIGI] These allows to have multiple repositories with the same packages -# [DIGI] but with custom modifications. -# [DIGI] Not currently used but left here for reference. - -BBFILE_COLLECTIONS += "del" -BBFILE_PATTERN_del := "^${LAYERDIR}/" -BBFILE_PRIORITY_del = "5" - # [DIGI] This is the FSL license agreement. FSL_MMK_EULA_FILE = "${LAYERDIR}/FSL_MMK_EULA" diff --git a/meta-digi-del/DIGI_EULA b/meta-digi-del/DIGI_EULA new file mode 100644 index 000000000..a87ed63eb --- /dev/null +++ b/meta-digi-del/DIGI_EULA @@ -0,0 +1,90 @@ + END-USER LICENSE AGREEMENT + DIGI DEVELOPMENT KIT + (PN 90001132) + +This end-user license agreement is a legal agreement between you +(either an individual or a single entity) and Digi International, Inc. +("Digi") for use of Digi Technology. This license applies to the +product with which it was shipped, which may be a Development Kit or a +unit of Digi Hardware. By using Digi product, you are consenting to be +bound by and are becoming a party to this end-user license agreement. + +DEFINITIONS + +o "Digi Hardware" shall mean electronic assemblies and accessories + provided by Digi, under the Digi brand name. + +o "Digi Software" shall mean the computer software code that is + distributed by Digi and not subject to third-party ownership rights. + +o "Digi Technology" refers to Digi Hardware and Digi Software. + +o "Development Kit" refers to a combination of Digi Hardware, + Digi Software, and documentation and may also include third-party + components. + +COPYRIGHT AND INTELLECTUAL PROPERTY + +All title and copyrights in and to the design, manufacture and +underlying intellectual property of the Digi Hardware are owned by +Digi. The Digi Software is protected by copyright laws and international +treaty provisions. The Digi Software is not open source software unless +specifically stated. Therefore, you must treat the Digi Software like +any other copyrighted material. + +SOFTWARE + +Digi Software is covered by copyright and licensed (not sold). Digi +Software is licensed only for use by the person or organization that is the +intended end user and only for the purpose of evaluating Digi Technology +and developing solutions that incorporate Digi Technology. Digi Software +may only be used in conjunction with Digi Hardware. Copies of Digi Software +may not be redistributed on a standalone basis or as part of any product +not incorporating Digi Hardware. + +THIRD-PARTY COMPONENTS + +A Development Kit may contain third-party components. THE LICENSE TO USE +A THIRD-PARTY COMPONENT IS PROVIDED SEPARATELY. YOUR USE OF THIRD PARTY +COMPONENTS WILL BE PURSUANT TO THE THIRD-PARTY LICENSE. + +WARRANTIES + +DIGI INTERNATIONAL, INC. EXPRESSLY DISCLAIMS ALL WARRANTIES FOR THE +DIGI TECHNOLOGY AND ANY THIRD PARTY COMPONENTS. DIGI INTERNATIONAL, +INC. DOES NOT WARRANT THAT THE DIGI TECHNOLOGY IS ERROR FREE OR WILL +WORK AS INTENDED. THE DIGI TECHNOLOGY AND ANY RELATED DOCUMENTATION +ARE PROVIDED "AS IS" WITH ALL FAULTS, WITHOUT WARRANTY OF ANY KIND, +EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND +NON-INFRINGEMENT. THE ENTIRE RISK ARISING OUT OF USE OR PERFORMANCE OF +THE DIGI TECHNOLOGY REMAINS WITH THE END-USER. + +LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES + +IN NO EVENT SHALL DIGI INTERNATIONAL INC. OR ITS SUPPLIERS BE LIABLE FOR +ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS +OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, +OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO +USE THIS PRODUCT, EVEN IF DIGI INTERNATIONAL INC. HAS BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME STATES/JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR +INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU. + +MISCELLANEOUS + +This agreement is governed by the laws of the State of Minnesota. You +agree to comply with all applicable United States export control laws +and regulations concerning export and re-export of products, technology +and documentation, including without limitation, the laws and regulations +administered by the United States Department of Commerce and the United +States Department of State. + +------------------------------------------------------------------------- + U-BOOT LICENSE NOTICE + +THE U-BOOT SOFTWARE THAT IS PROVIDED WITH DIGI SOFTWARE AND DIGI HARDWARE +IS COVERED BY THE GNU GENERAL PUBLIC LICENSE (VERSION 2 OR LATER) AS +PUBLISHED BY THE FREE SOFTWARE FOUNDATION. + +Please visit http://www.denx.de for current U-Boot license information. diff --git a/meta-digi-del/DIGI_OPEN_EULA b/meta-digi-del/DIGI_OPEN_EULA new file mode 100644 index 000000000..bd627eeeb --- /dev/null +++ b/meta-digi-del/DIGI_OPEN_EULA @@ -0,0 +1,75 @@ + THIRD PARTY AND OPEN SOURCE LICENSE NOTICE + DIGI EMBEDDED LINUX + (PN 93000719) + + +The product with which this notice was originally transmitted +contains a combination of hardware, software and documentary components +("Components"). The Components are provided for use under various +licenses that are unique to each Component. + + +THIRD PARTY COMPONENTS + +OpenSSL is subject to the terms and conditions of the OpenSSL/SSLeay +License ("OpenSSL License"). The OpenSSL/SSLeay Components are +provided under the terms of the OpenSSL/SSLeay License, and any use +of such OpenSSL/SSLeay Components shall comply with the terms and +conditions of that license. A copy of the OpenSSL/SSLeay license is +available in the license.txt file accompanying the Components and at +http://www.openssl.org/source/license.html + +The WPA/WPA2 supplicant is dual-licensed under both the GPL version +2 and BSD license, and any use of such Components shall comply with +the terms and conditions of those licenses. + +The Qt Components ("Qt Components") are provided under the terms +of the GNU Lesser General Public License version 2.1 ("LGPL"), +and any use of such Qt Components shall comply with the terms and +conditions of that license. For Qt production licensing, refer to +http://qt.nokia.com/products/licensing for detailed information. + +Use of Components that are subject to one of the versions of the +GNU General Public License ("GPL") shall comply with the terms and +conditions of those licenses. Copies of the GPL licenses are available +at http://www.gnu.org/licenses/licenses.html. + + +DIGI COMPONENTS + +The Components that are not the property of a third party are the +property of Digi International Inc. Unless otherwise noted, Digi +Components are provided pursuant to a Digi End-User License Agreement. + +The WPA supplicant has been modified by Digi, and the modification +is distributed under the terms of the BSD License set forth below: + +***************** +Copyright (c) Digi International, Inc. +All rights reserved. + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +* Neither the name of the Digi International Inc. nor the names of + its contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +***************** + diff --git a/meta-digi-del/README b/meta-digi-del/README new file mode 100644 index 000000000..f9c9c2039 --- /dev/null +++ b/meta-digi-del/README @@ -0,0 +1,23 @@ +OpenEmbedded/Yocto Digi Embedded Linux layer +============================================ + +This layer provides the Digi Embedded Linux distribution images. + +Digi's license agreements +------------------------- + +All software is covered by Digi's general EULA and Digi's Open Source +EULA. To have the right to use the software in your images you need to +read and accept both EULAs at the DIGI_EULA and DIGI_OPEN_EULA files. + +In order to accept them, you should add, in your local.conf file: + +ACCEPT_DIGI_EULA = "1" +ACCEPT_DIGI_OPEN_EULA = "1" + +Support +------- + +This layer is provided 'as is' with no guarantee. However, some support +may be available from support@digi.com + diff --git a/meta-digi-arm/conf/distro/del.conf b/meta-digi-del/conf/distro/del.conf similarity index 100% rename from meta-digi-arm/conf/distro/del.conf rename to meta-digi-del/conf/distro/del.conf diff --git a/meta-digi-del/conf/layer.conf b/meta-digi-del/conf/layer.conf new file mode 100644 index 000000000..f76b8e22c --- /dev/null +++ b/meta-digi-del/conf/layer.conf @@ -0,0 +1,19 @@ +BBPATH := "${BBPATH}:${LAYERDIR}" + +BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "del" +BBFILE_PATTERN_del := "^${LAYERDIR}/" +BBFILE_PRIORITY_del = "5" + +# [DIGI] This is Digi's General license agreement. +DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA" + +# [DIGI] This is Digi's Open Source license agreement. +DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA" + +DIGI_MIRROR ?= "http://www.digi.com/yocto/" + +# [DIGI] PREMIRRORS and tried first and if not found, all MIRRORS next. +MIRRORS += "${DIGI_MIRROR} \n" diff --git a/meta-digi-arm/recipes-core/base-passwd-3.5.24/add-shadow-file.patch b/meta-digi-del/recipes-core/base-passwd-3.5.24/add-shadow-file.patch similarity index 100% rename from meta-digi-arm/recipes-core/base-passwd-3.5.24/add-shadow-file.patch rename to meta-digi-del/recipes-core/base-passwd-3.5.24/add-shadow-file.patch diff --git a/meta-digi-arm/recipes-core/base-passwd-3.5.24/base-passwd_3.5.24.bb b/meta-digi-del/recipes-core/base-passwd-3.5.24/base-passwd_3.5.24.bb similarity index 100% rename from meta-digi-arm/recipes-core/base-passwd-3.5.24/base-passwd_3.5.24.bb rename to meta-digi-del/recipes-core/base-passwd-3.5.24/base-passwd_3.5.24.bb diff --git a/meta-digi-arm/recipes-core/base-passwd-3.5.24/nobash.patch b/meta-digi-del/recipes-core/base-passwd-3.5.24/nobash.patch similarity index 100% rename from meta-digi-arm/recipes-core/base-passwd-3.5.24/nobash.patch rename to meta-digi-del/recipes-core/base-passwd-3.5.24/nobash.patch diff --git a/meta-digi-arm/recipes-core/base-passwd-3.5.24/root-home.patch b/meta-digi-del/recipes-core/base-passwd-3.5.24/root-home.patch similarity index 100% rename from meta-digi-arm/recipes-core/base-passwd-3.5.24/root-home.patch rename to meta-digi-del/recipes-core/base-passwd-3.5.24/root-home.patch diff --git a/meta-digi-arm/recipes-core/busybox-1.19.4/busybox_1.19.4.bbappend b/meta-digi-del/recipes-core/busybox-1.19.4/busybox_1.19.4.bbappend similarity index 100% rename from meta-digi-arm/recipes-core/busybox-1.19.4/busybox_1.19.4.bbappend rename to meta-digi-del/recipes-core/busybox-1.19.4/busybox_1.19.4.bbappend diff --git a/meta-digi-arm/recipes-core/busybox-1.19.4/files/defconfig-del b/meta-digi-del/recipes-core/busybox-1.19.4/files/defconfig-del similarity index 100% rename from meta-digi-arm/recipes-core/busybox-1.19.4/files/defconfig-del rename to meta-digi-del/recipes-core/busybox-1.19.4/files/defconfig-del diff --git a/meta-digi-arm/recipes-core/images/del-image-minimal.bb b/meta-digi-del/recipes-core/images/del-image-minimal.bb similarity index 100% rename from meta-digi-arm/recipes-core/images/del-image-minimal.bb rename to meta-digi-del/recipes-core/images/del-image-minimal.bb diff --git a/meta-digi-arm/recipes-core/tasks/task-del-core.bb b/meta-digi-del/recipes-core/tasks/task-del-core.bb similarity index 100% rename from meta-digi-arm/recipes-core/tasks/task-del-core.bb rename to meta-digi-del/recipes-core/tasks/task-del-core.bb