[OE-core] [PATCH 1/3][dizzy] recipes-connectivity: Add hostapd configuration for enabling Marvell 8897 WiFi feature
From: Ng Shui Lei Hostapd feature was created in the recipes-connectivity layer to enable Marvell 8897 module in AP mode and STA mode. Signed-off-by: Ng Shui Lei Signed-off-by: Ng Wei Tee --- .../hostapd/hostapd-2.2/defconfig | 145 .../hostapd/hostapd-2.2/hostapd.service| 11 ++ meta/recipes-connectivity/hostapd/hostapd-2.2/init | 58 meta/recipes-connectivity/hostapd/hostapd_2.2.bb | 48 +++ 4 files changed, 262 insertions(+) create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/init create mode 100644 meta/recipes-connectivity/hostapd/hostapd_2.2.bb diff --git a/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig b/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig new file mode 100644 index 000..2789640 --- /dev/null +++ b/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig @@ -0,0 +1,145 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +#CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../../madwifi # change to the madwifi source directory + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# Driver interface for drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y +CONFIG_LIBNL32=y +# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be +# shipped with your distribution yet. If that is the case, you need to build +# newer libnl version and point the hostapd build to use it. +#LIBNL=/usr/src/libnl +#CFLAGS += -I$(LIBNL)/include +#LIBS += -L$(LIBNL)/lib + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# Driver interface for no driver (e.g., RADIUS server only) +#CONFIG_DRIVER_NONE=y + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +#CONFIG_IEEE80211W=y + +# Integrated EAP server +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP server +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP server +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP server +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP server +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP server +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP server +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP server +#CONFIG_EAP_SIM=y + +# EAP-AKA for the integrated EAP server +#CONFIG_EAP_AKA=y + +# EAP-AKA' for the integrated EAP server +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# EAP-PAX for the integrated EAP server +#CONFIG_EAP_PAX=y + +# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-SAKE for the integrated EAP server +#CONFIG_EAP_SAKE=y + +# EAP-GPSK for the integrated EAP server +#CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +#CONFIG_EAP_GPSK_SHA256=y + +# EAP-FAST for the integrated EAP server +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + +# Wi-Fi Protected Setup (WPS) +CONFIG_WPS=y +# Enable UPnP support for external WPS Registrars +#CONFIG_WPS_UPNP=y + +# EAP-IKEv2 +#CONFIG_EAP_IKEV2=y + +# Trusted Network Connect (EAP-TNC) +#CONFIG_EAP_TNC=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# server from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y + +# Build IPv6 support for RADIUS operations
[OE-core] [PATCH 2/3][dizzy] recipes-connectivity: Add iw configuration for enabling Marvell 8897 WiFi feature
From: Ng Shui Lei iw feature was created in the recipes-connectivity layer to enable Marvell 8897 module in AP mode and STA mode. iw is a new nl80211 based CLI configuration utility for wireless devices. Signed-off-by: Ng Shui Lei Signed-off-by: Ng Wei Tee --- sh-don-t-use-git-describe-for-versioning.patch | 40 meta/recipes-connectivity/iw/iw_3.8.bb | 27 + 2 files changed, 67 insertions(+) create mode 100644 meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch create mode 100644 meta/recipes-connectivity/iw/iw_3.8.bb diff --git a/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch new file mode 100644 index 000..f4a7ee7 --- /dev/null +++ b/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch @@ -0,0 +1,40 @@ +From: Koen Kooi +Date: Tue, 29 Nov 2011 17:03:27 +0100 +Subject: [PATCH] iw: version.sh: don't use git describe for versioning + +It will detect top-level git repositories like the Angstrom setup-scripts and break. + +Upstream-status: Unknown + +Signed-off-by: Koen Kooi +--- + version.sh | 16 +--- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/version.sh b/version.sh +index db02f0d..336ce2b 100755 +--- a/version.sh b/version.sh +@@ -3,21 +3,7 @@ + VERSION="3.8" + OUT="$1" + +-if head=`git rev-parse --verify HEAD 2>/dev/null`; then +- git update-index --refresh --unmerged > /dev/null +- descr=$(git describe) +- +- # on git builds check that the version number above +- # is correct... +- [ "${descr%%-*}" = "v$VERSION" ] || exit 2 +- +- v="${descr#v}" +- if git diff-index --name-only HEAD | read dummy ; then +- v="$v"-dirty +- fi +-else +- v="$VERSION" +-fi ++v="$VERSION" + + echo '#include "iw.h"' > "$OUT" + echo "const char iw_version[] = \"$v\";" >> "$OUT" diff --git a/meta/recipes-connectivity/iw/iw_3.8.bb b/meta/recipes-connectivity/iw/iw_3.8.bb new file mode 100644 index 000..29dbcd0 --- /dev/null +++ b/meta/recipes-connectivity/iw/iw_3.8.bb @@ -0,0 +1,27 @@ +# Copyright (C) 2013 Digi International. + +SUMMARY = "nl80211 based CLI configuration utility for wireless devices" +DESCRIPTION = "iw is a new nl80211 based CLI configuration utility for \ +wireless devices. It supports almost all new drivers that have been added \ +to the kernel recently. " +HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw"; +SECTION = "base" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774" + +DEPENDS = "libnl pkgconfig" + +PR = "${DISTRO}.r0" + +SRC_URI = "http://www.kernel.org/pub/software/network/iw/iw-${PV}.tar.bz2 \ + file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ + " + +SRC_URI[md5sum] = "618ad1106a196fb1c3d827de96da437c" +SRC_URI[sha256sum] = "3dae92ca5989cbc21155941fa01907a5536da3c5f6898642440c61484fc7e0f9" + +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake DESTDIR=${D} install +} -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3][dizzy] linux-firmware: Package Marvell pci8897 and usb8897 firmware
From: Ng Wei Tee Signed-off-by: Ng Shui Lei Signed-off-by: Ng Wei Tee --- .../linux-firmware/linux-firmware_git.bb | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index a107f80..bd0b9a3 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=07b0c31777bd686d8e1609c6940b5e74\ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ file://LICENCE.qla2xxx;md5=f5ce8529ec5c17cb7f911d2721d90e91 \ - file://LICENCE.iwlwifi_firmware;md5=8b938534f77ffd453690eb34ed84ae8b \ + file://LICENCE.iwlwifi_firmware;md5=5106226b2863d00d8ed553221ddf8cd2 \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=07b0c31777bd686d8e1609c6940b5e74\ file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ " -SRCREV = "dec41bce44e0dff6a2c3358a958fadf22bf58858" +SRCREV = "ec89525b2ab65f1d5ae4f67e27f0d525ddedd2ef" PE = "1" PV = "0.0+git${SRCPV}" @@ -62,7 +62,7 @@ do_install() { PACKAGES =+ "${PN}-ralink \ ${PN}-radeon \ - ${PN}-marvell-license ${PN}-sd8686 ${PN}-sd8787 ${PN}-sd8797 \ + ${PN}-marvell-license ${PN}-sd8686 ${PN}-sd8787 ${PN}-sd8797 ${PN}-pcie8897 ${PN}-usb8897 \ ${PN}-wl12xx ${PN}-wl18xx ${PN}-vt6656 \ ${PN}-rtl-license ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su \ ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 \ @@ -133,6 +133,19 @@ FILES_${PN}-sd8797 = " \ " RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license" +LICENSE_${PN}-pcie8897 = "Firmware-Marvell" +FILES_${PN}-pcie8897 = " \ + /lib/firmware/mrvl/pcie8897_uapsta.bin \ +" +RDEPENDS_${PN}-pcie8897 += "${PN}-marvell-license" + +LICENSE_${PN}-usb8897 = "Firmware-Marvell" +FILES_${PN}-usb8897 = " \ + /lib/firmware/mrvl/usb8897_uapsta.bin \ +" +RDEPENDS_${PN}-usb8897 += "${PN}-marvell-license" + + FILES_${PN}-rtl-license = " \ /lib/firmware/LICENCE.rtlwifi_firmware.txt \ " -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] [dizzy] Enable Marvell 8897 Wifi feature
From: Ng Wei Tee Hi all, I would like to add hostapd and iw configuration for enabling Marvell 8897 Wifi feature. Hostapd and iw configuration were created in the recipes-connectivity layer to enable Marvell 8897 module function in AP Mode and STA mode. This also package the Marvell pci8897 and usb8897 in the recipes-kernel/linux-firmware and intel iwlwifi firmware copyright years changed. Please review and provide feedback if any. This patch is target to merge in openembedded-core dizzy branch. Regards, Wei Tee Ng Shui Lei (2): recipes-connectivity: Add hostapd configuration for enabling Marvell 8897 WiFi feature recipes-connectivity: Add iw configuration for enabling Marvell 8897 WiFi feature Ng Wei Tee (1): linux-firmware: Package Marvell pci8897 and usb8897 firmware .../hostapd/hostapd-2.2/defconfig | 145 .../hostapd/hostapd-2.2/hostapd.service| 11 ++ meta/recipes-connectivity/hostapd/hostapd-2.2/init | 58 meta/recipes-connectivity/hostapd/hostapd_2.2.bb | 48 +++ sh-don-t-use-git-describe-for-versioning.patch | 40 ++ meta/recipes-connectivity/iw/iw_3.8.bb | 27 .../linux-firmware/linux-firmware_git.bb | 19 ++- 7 files changed, 345 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/init create mode 100644 meta/recipes-connectivity/hostapd/hostapd_2.2.bb create mode 100644 meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch create mode 100644 meta/recipes-connectivity/iw/iw_3.8.bb -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] [master][dizzy] Enable Marvel 8897 Wifi feature
From: Ng Wei Tee Hi all, I would like to add hostapd and iw configuration for enabling Marvell 8897 Wifi feature. Hostapd and iw configuration were created in the recipes-connectivity layer to enable Marvell 8897 module function in AP mode and STA mode. Please review and provide feedback if any. This patch is target to merge in openembedded-core master and dizzy branch. Thanks. Regards, Wei Tee Ng Shui Lei (2): recipes-connectivity: Add hostapd configuration for enabling Marvell 8897 WiFi feature recipes-connectivity: Add iw configuration for enabling Marvell 8897 WiFi feature .../hostapd/hostapd-2.2/defconfig | 145 .../hostapd/hostapd-2.2/hostapd.service| 11 ++ meta/recipes-connectivity/hostapd/hostapd-2.2/init | 58 meta/recipes-connectivity/hostapd/hostapd_2.2.bb | 48 +++ sh-don-t-use-git-describe-for-versioning.patch | 40 ++ meta/recipes-connectivity/iw/iw_3.8.bb | 27 6 files changed, 329 insertions(+) create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/init create mode 100644 meta/recipes-connectivity/hostapd/hostapd_2.2.bb create mode 100644 meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch create mode 100644 meta/recipes-connectivity/iw/iw_3.8.bb -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] recipes-connectivity: Add hostapd configuration for enabling Marvell 8897 WiFi feature
From: Ng Shui Lei Hostapd features was created in the recipes-connectivity layer to enable Marvell 8897 module in AP mode and STA mode. Signed-off-by: Ng Shui Lei Signed-off-by: Ng Wei Tee --- .../hostapd/hostapd-2.2/defconfig | 145 .../hostapd/hostapd-2.2/hostapd.service| 11 ++ meta/recipes-connectivity/hostapd/hostapd-2.2/init | 58 meta/recipes-connectivity/hostapd/hostapd_2.2.bb | 48 +++ 4 files changed, 262 insertions(+) create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/init create mode 100644 meta/recipes-connectivity/hostapd/hostapd_2.2.bb diff --git a/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig b/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig new file mode 100644 index 000..2789640 --- /dev/null +++ b/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig @@ -0,0 +1,145 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +#CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../../madwifi # change to the madwifi source directory + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# Driver interface for drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y +CONFIG_LIBNL32=y +# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be +# shipped with your distribution yet. If that is the case, you need to build +# newer libnl version and point the hostapd build to use it. +#LIBNL=/usr/src/libnl +#CFLAGS += -I$(LIBNL)/include +#LIBS += -L$(LIBNL)/lib + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# Driver interface for no driver (e.g., RADIUS server only) +#CONFIG_DRIVER_NONE=y + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +#CONFIG_IEEE80211W=y + +# Integrated EAP server +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP server +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP server +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP server +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP server +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP server +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP server +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP server +#CONFIG_EAP_SIM=y + +# EAP-AKA for the integrated EAP server +#CONFIG_EAP_AKA=y + +# EAP-AKA' for the integrated EAP server +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# EAP-PAX for the integrated EAP server +#CONFIG_EAP_PAX=y + +# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-SAKE for the integrated EAP server +#CONFIG_EAP_SAKE=y + +# EAP-GPSK for the integrated EAP server +#CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +#CONFIG_EAP_GPSK_SHA256=y + +# EAP-FAST for the integrated EAP server +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + +# Wi-Fi Protected Setup (WPS) +CONFIG_WPS=y +# Enable UPnP support for external WPS Registrars +#CONFIG_WPS_UPNP=y + +# EAP-IKEv2 +#CONFIG_EAP_IKEV2=y + +# Trusted Network Connect (EAP-TNC) +#CONFIG_EAP_TNC=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# server from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y + +# Build IPv6 support for RADIUS operation
[OE-core] [PATCH 2/2] recipes-connectivity: Add iw configuration for enabling Marvell 8897 WiFi feature
From: Ng Shui Lei iw features was created in the recipes-connectivity layer to enable Marvell 8897 module in AP mode and STA mode. iw is a new nl80211 based CLI configuration utility for wireless devices. Signed-off-by: Ng Shui Lei Signed-off-by: Ng Wei Tee --- sh-don-t-use-git-describe-for-versioning.patch | 40 meta/recipes-connectivity/iw/iw_3.8.bb | 27 + 2 files changed, 67 insertions(+) create mode 100644 meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch create mode 100644 meta/recipes-connectivity/iw/iw_3.8.bb diff --git a/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch new file mode 100644 index 000..f4a7ee7 --- /dev/null +++ b/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch @@ -0,0 +1,40 @@ +From: Koen Kooi +Date: Tue, 29 Nov 2011 17:03:27 +0100 +Subject: [PATCH] iw: version.sh: don't use git describe for versioning + +It will detect top-level git repositories like the Angstrom setup-scripts and break. + +Upstream-status: Unknown + +Signed-off-by: Koen Kooi +--- + version.sh | 16 +--- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/version.sh b/version.sh +index db02f0d..336ce2b 100755 +--- a/version.sh b/version.sh +@@ -3,21 +3,7 @@ + VERSION="3.8" + OUT="$1" + +-if head=`git rev-parse --verify HEAD 2>/dev/null`; then +- git update-index --refresh --unmerged > /dev/null +- descr=$(git describe) +- +- # on git builds check that the version number above +- # is correct... +- [ "${descr%%-*}" = "v$VERSION" ] || exit 2 +- +- v="${descr#v}" +- if git diff-index --name-only HEAD | read dummy ; then +- v="$v"-dirty +- fi +-else +- v="$VERSION" +-fi ++v="$VERSION" + + echo '#include "iw.h"' > "$OUT" + echo "const char iw_version[] = \"$v\";" >> "$OUT" diff --git a/meta/recipes-connectivity/iw/iw_3.8.bb b/meta/recipes-connectivity/iw/iw_3.8.bb new file mode 100644 index 000..29dbcd0 --- /dev/null +++ b/meta/recipes-connectivity/iw/iw_3.8.bb @@ -0,0 +1,27 @@ +# Copyright (C) 2013 Digi International. + +SUMMARY = "nl80211 based CLI configuration utility for wireless devices" +DESCRIPTION = "iw is a new nl80211 based CLI configuration utility for \ +wireless devices. It supports almost all new drivers that have been added \ +to the kernel recently. " +HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw"; +SECTION = "base" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774" + +DEPENDS = "libnl pkgconfig" + +PR = "${DISTRO}.r0" + +SRC_URI = "http://www.kernel.org/pub/software/network/iw/iw-${PV}.tar.bz2 \ + file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ + " + +SRC_URI[md5sum] = "618ad1106a196fb1c3d827de96da437c" +SRC_URI[sha256sum] = "3dae92ca5989cbc21155941fa01907a5536da3c5f6898642440c61484fc7e0f9" + +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake DESTDIR=${D} install +} -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] initramfs-framework: udev: Add a runtime dependency on udev-extraconf
From: "Ng, Wei Tee" In order to implement initramfs-framework for boot up process, it depends on udev performing automounting, which happens in udev-extraconf. Explicitly depend on it so that we always have it installed. Signed-off-by: Ng, Wei Tee --- meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 67a1b04..6bbe4c1 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -65,7 +65,7 @@ RDEPENDS_initramfs-module-mdev = "${PN}-base busybox-mdev" FILES_initramfs-module-mdev = "/init.d/01-mdev" SUMMARY_initramfs-module-udev = "initramfs support for udev" -RDEPENDS_initramfs-module-udev = "${PN}-base udev" +RDEPENDS_initramfs-module-udev = "${PN}-base udev udev-extraconf" FILES_initramfs-module-udev = "/init.d/01-udev" SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [poky][master][PATCH 0/3] initramfs-framework: configuration to boot up live image
From: "Ng, Wei Tee" This patch is to get initramfs-framework able to boot up live image. In order to implement this framework, there is a need to add runtime dependency on udev-extraconf due to the automounting process. Secondly, a new scriptlet named setup-live module has been created to handle the removeable media detection and assign the rootfs.img. This is because the current rootfs module has no support for rootfs images, only rootfs partitions. This change has been verified with build test and boot up test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe: bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-v2 http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-v2 Ng, Wei Tee (3): initramfs-framework: udev: Add a runtime dependency on udev-extraconf initramfs-framework: setup-live: detect media and assign rootfs image initramfs-framwork: module to support boot live image .../initrdscripts/initramfs-framework/setup-live | 67 ++ .../initrdscripts/initramfs-framework_1.0.bb | 8 ++- 2 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] initramfs-framework: setup-live: detect media and assign rootfs image
From: "Ng, Wei Tee" Integrate the featuers in init-live.sh into new scriptlet to handle boot up live image process using framework method. This commit include the changes for: - Create a conditional loop for the bootparam_root variable. If it is not set, then it will boot from ROOT_IMAGE. Else, it will boot normally which is not from removable media. - Gives a standard path to the original boot disk mount which can be used to. While /media/sda is a good guess, it isn't always right, nor is it a good assumption that only one boot disk is in the system. - The current rootfs module has no support for rootfs images, currently it only support for rootfs partitions for wic image. Therefore, there is a need to assign the rootfs image for live image. Signed-off-by: Ng, Wei Tee --- .../initrdscripts/initramfs-framework/setup-live | 67 ++ 1 file changed, 67 insertions(+) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live new file mode 100644 index 000..16da34a --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -0,0 +1,67 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=30 + + if [ -z $bootparam_root ]; then + echo "Waiting for removable media..." + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo -n " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + C=$(( C + 1 )) + fi + sleep 1 + done + + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + else + break + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] initramfs-framwork: module to support boot live image
From: "Ng, Wei Tee" setup-live module is a new module being introduced to integrate the functionality of init-live.sh into new scriptlet in order to support the live boot image. It gets to run before the rootfs and finish module. Signed-off-by: Ng, Wei Tee --- meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 6bbe4c1..f7b47d9 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -13,7 +13,8 @@ SRC_URI = "file://init \ file://mdev \ file://udev \ file://e2fs \ - file://debug" + file://debug \ + file://setup-live" S = "${WORKDIR}" @@ -24,6 +25,7 @@ do_install() { install -m 0755 ${WORKDIR}/init ${D}/init install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish +install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live # mdev install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev @@ -50,7 +52,7 @@ PACKAGES = "${PN}-base \ initramfs-module-rootfs \ initramfs-module-debug" -FILES_${PN}-base = "/init /init.d/99-finish /dev" +FILES_${PN}-base = "/init /init.d/99-finish /init.d/80-setup-live /dev" # 99-finish in base depends on some other module which mounts # the rootfs, like 90-rootfs. To replace that default, use -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/3] initramfs-framwork: module to support boot live image
From: "Ng, Wei Tee" setup-live module is a new module being introduced to integrate the functionality of init-live.sh into new scriptlet in order to support the live boot image. It gets to run before the rootfs and finish module. [YOCTO #11701] Signed-off-by: Ng, Wei Tee --- meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 6bbe4c1..f7b47d9 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -13,7 +13,8 @@ SRC_URI = "file://init \ file://mdev \ file://udev \ file://e2fs \ - file://debug" + file://debug \ + file://setup-live" S = "${WORKDIR}" @@ -24,6 +25,7 @@ do_install() { install -m 0755 ${WORKDIR}/init ${D}/init install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish +install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live # mdev install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev @@ -50,7 +52,7 @@ PACKAGES = "${PN}-base \ initramfs-module-rootfs \ initramfs-module-debug" -FILES_${PN}-base = "/init /init.d/99-finish /dev" +FILES_${PN}-base = "/init /init.d/99-finish /init.d/80-setup-live /dev" # 99-finish in base depends on some other module which mounts # the rootfs, like 90-rootfs. To replace that default, use -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/3] initramfs-framework: setup-live: detect media and assign rootfs image
From: "Ng, Wei Tee" Integrate the featuers in init-live.sh into new scriptlet to handle boot up live image process using framework method. This commit include the changes for: - Create a conditional loop for the bootparam_root variable. If it is not set, then it will boot from ROOT_IMAGE. Else, it will boot normally which is not from removable media. - Gives a standard path to the original boot disk mount which can be used to. While /media/sda is a good guess, it isn't always right, nor is it a good assumption that only one boot disk is in the system. - The current rootfs module has no support for rootfs images, currently it only support for rootfs partitions for wic image. Therefore, there is a need to assign the rootfs image for live image. Signed-off-by: Ng, Wei Tee --- .../initrdscripts/initramfs-framework/setup-live | 67 ++ 1 file changed, 67 insertions(+) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live new file mode 100644 index 000..16da34a --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -0,0 +1,67 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=30 + + if [ -z $bootparam_root ]; then + echo "Waiting for removable media..." + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo -n " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + C=$(( C + 1 )) + fi + sleep 1 + done + + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + else + break + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/3] initramfs-framework: udev: Add a runtime dependency on udev-extraconf
From: "Ng, Wei Tee" In order to implement initramfs-framework for boot up process, it depends on udev performing automounting, which happens in udev-extraconf. Explicitly depend on it so that we always have it installed. Signed-off-by: Ng, Wei Tee --- meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 67a1b04..6bbe4c1 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -65,7 +65,7 @@ RDEPENDS_initramfs-module-mdev = "${PN}-base busybox-mdev" FILES_initramfs-module-mdev = "/init.d/01-mdev" SUMMARY_initramfs-module-udev = "initramfs support for udev" -RDEPENDS_initramfs-module-udev = "${PN}-base udev" +RDEPENDS_initramfs-module-udev = "${PN}-base udev udev-extraconf" FILES_initramfs-module-udev = "/init.d/01-udev" SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [poky][master][PATCH v2 0/3] initramfs-framework: configuration to boot up live image
From: "Ng, Wei Tee" This patch is to get initramfs-framework able to boot up live image. In order to implement this framework, there is a need to add runtime dependency on udev-extraconf due to the automounting process. Secondly, a new scriptlet named setup-live module has been created to handle the removeable media detection and assign the rootfs.img. This is because the current rootfs module has no support for rootfs images, only rootfs partitions. This change has been verified with build test and boot up test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe: bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-v2 http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-v2 Ng, Wei Tee (3): initramfs-framework: udev: Add a runtime dependency on udev-extraconf initramfs-framework: setup-live: detect media and assign rootfs image initramfs-framwork: module to support boot live image .../initrdscripts/initramfs-framework/setup-live | 67 ++ .../initrdscripts/initramfs-framework_1.0.bb | 8 ++- 2 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [poky][master] [PATCH v3 0/2] initramfs-framework: configuration to boot up live image
From: "Ng, Wei Tee" Hi, This patch is to get initramfs-framework able to boot up live image. A new scriplet named setup-live module has been created to handle the removeable media detection and assign the rootfs.img. This is because the current rootfs module has no support for rootfs images, only rootfs partitions. This version 3 included the changes for creation of initramfs-module-setup-live in the recipe and added udev-extraconf rdepends on this module because it is needed for automounting process. This changes has been verified with build test and boot up test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 4b1d270602a0542eef1b497eaf15bad2b747686f: bitbake: bitbake-user-manual: Removed and replaced broken link (2017-07-04 16:05:22 +0100) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-v3 http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-v3 Ng, Wei Tee (2): initramfs-framework: setup-live: detect media and assign rootfs image initramfs-framwork: module to support boot live image .../initrdscripts/initramfs-framework/setup-live | 67 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/2] initramfs-framwork: module to support boot live image
From: "Ng, Wei Tee" setup-live module is a new module being introduced to integrate the functionality of init-live.sh into new scriptlet in order to support the live boot image. The udev-extraconf rdepends is being added to perform automounting. It gets to run before the rootfs and finish module. [YOCTO #11701] Signed-off-by: Ng, Wei Tee --- This v3 changes included the creation of new initramfs-module-setup-live and added the udev-extraconf rdepends on this module as live-boot require it to work. meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 67a1b04..aa1d847 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -13,7 +13,8 @@ SRC_URI = "file://init \ file://mdev \ file://udev \ file://e2fs \ - file://debug" + file://debug \ + file://setup-live" S = "${WORKDIR}" @@ -25,6 +26,9 @@ do_install() { install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish +# setup-live +install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live + # mdev install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev @@ -48,7 +52,8 @@ PACKAGES = "${PN}-base \ initramfs-module-udev \ initramfs-module-e2fs \ initramfs-module-rootfs \ -initramfs-module-debug" +initramfs-module-debug \ + initramfs-module-setup-live" FILES_${PN}-base = "/init /init.d/99-finish /dev" @@ -68,6 +73,10 @@ SUMMARY_initramfs-module-udev = "initramfs support for udev" RDEPENDS_initramfs-module-udev = "${PN}-base udev" FILES_initramfs-module-udev = "/init.d/01-udev" +SUMMARY_initramfs-module-setup-live = "initramfs support for setup live" +RDEPENDS_initramfs-module-setup-live = "${PN}-base udev-extraconf" +FILES_initramfs-module-setup-live = "/init.d/80-setup-live" + SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems" RDEPENDS_initramfs-module-e2fs = "${PN}-base" FILES_initramfs-module-e2fs = "/init.d/10-e2fs" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/2] initramfs-framework: setup-live: detect media and assign rootfs image
From: "Ng, Wei Tee" Integrate the featuers in init-live.sh into new scriptlet to handle boot up live image process using framework method. This commit include the changes for: - Create a conditional loop for the bootparam_root variable. If it is not set, then it will boot from ROOT_IMAGE. Else, it will boot normally which is not from removable media. - Gives a standard path to the original boot disk mount which can be used to. While /media/sda is a good guess, it isn't always right, nor is it a good assumption that only one boot disk is in the system. - The current rootfs module has no support for rootfs images, currently it only support for rootfs partitions for wic image. Therefore, there is a need to assign the rootfs image for live image. Signed-off-by: Ng, Wei Tee --- .../initrdscripts/initramfs-framework/setup-live | 67 ++ 1 file changed, 67 insertions(+) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live new file mode 100644 index 000..16da34a --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -0,0 +1,67 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=30 + + if [ -z $bootparam_root ]; then + echo "Waiting for removable media..." + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo -n " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + C=$(( C + 1 )) + fi + sleep 1 + done + + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + else + break + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [poky][master] [PATCH v4 0/1] initramfs-framework: configuration to boot up live image
From: "Ng, Wei Tee" Hi, This patch is to get initramfs-framework able to boot up live image. A new scriplet named setup-live module has been created to handle the removeable media detection and assign the rootfs.img. This is because the current rootfs module has no support for rootfs images, only rootfs partitions. This version 4 included the changes for squashing 2 commits into single commit. It involve the creation of initramfs-module-setup-live in the recipe and added udev-extraconf rdepends on this module because it is needed for automounting process. This changes has been verified with build test and boot up test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 854c8c2e4c24ea3ddfec6e5b5f6477f0620510e4: oeqa/tinfoil: Improve test_wait_event for race issues (2017-07-08 13:34:46 +0100) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-final http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-final Ng, Wei Tee (1): initramfs-framwork: module to support boot live image .../initrdscripts/initramfs-framework/setup-live | 67 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 1/1] initramfs-framwork: module to support boot live image
From: "Ng, Wei Tee" setup-live module is a new module being introduced to integrate the functionality of init-live.sh into new scriptlet named setup-live in order to support the live boot image. The udev-extraconf rdepends is being added to perform automounting. It gets to run before the rootfs and finish module. The setup-live scriplet include the changes for: - Create a conditional loop for the bootparam_root variable. If it is not set, then it will boot from ROOT_IMAGE. Else, it will boot normally which is not from removable media. - Gives a standard path to the original boot disk mount which can be used to. While /media/sda is a good guess, it isn't always right, nor is it a good assumption that only one boot disk is in the system. - The current rootfs module has no support for rootfs images, currently it only support for rootfs partitions for wic image. Therefore, there is a need to assign the rootfs image for live image. [YOCTO #11701] Signed-off-by: Ng, Wei Tee --- This v4 is to squash these changes into single commit. .../initrdscripts/initramfs-framework/setup-live | 67 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live new file mode 100644 index 000..16da34a --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -0,0 +1,67 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=30 + + if [ -z $bootparam_root ]; then + echo "Waiting for removable media..." + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo -n " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + C=$(( C + 1 )) + fi + sleep 1 + done + + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + else + break + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 67a1b04..aa1d847 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -13,7 +13,8 @@ SRC_URI = "file://init \ file://mdev \ file://udev \ file://e2fs \ - file://debug" + file://debug \ + file://setup-live" S = "${WORKDIR}" @@ -25,6 +26,9 @@ do_install() { install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish +# setup-live +install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live + # mdev install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev @@ -48,7 +52,8 @@ PACKAGES = "${PN}-base \ initra
[OE-core] [PATCH 1/1] initramfs-framwork: module to support boot live image
From: "Ng, Wei Tee" setup-live module is a new module being introduced to integrate the functionality of init-live.sh into new scriptlet named setup-live in order to support the live boot image. The udev-extraconf rdepends is being added to perform automounting. It gets to run before the rootfs and finish module. The setup-live scriplet include the changes for: - Create a conditional loop for the bootparam_root variable. If it is not set, then it will boot from ROOT_IMAGE. Else, it will boot normally which is not from removable media. - Gives a standard path to the original boot disk mount which can be used to. While /media/sda is a good guess, it isn't always right, nor is it a good assumption that only one boot disk is in the system. - The current rootfs module has no support for rootfs images, currently it only support for rootfs partitions for wic image. Therefore, there is a need to assign the rootfs image for live image. [YOCTO #11701] Signed-off-by: Ng, Wei Tee --- This v5 is to re-correct the bad indents in recipe file. .../initrdscripts/initramfs-framework/setup-live | 66 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live new file mode 100644 index 000..ec4a139 --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -0,0 +1,66 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=30 + + if [ -z $bootparam_root ]; then + echo "Waiting for removable media..." + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo -n " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + C=$(( C + 1 )) + fi + sleep 1 + done + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + else + break + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 67a1b04..211e89d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -13,7 +13,8 @@ SRC_URI = "file://init \ file://mdev \ file://udev \ file://e2fs \ - file://debug" + file://debug \ + file://setup-live" S = "${WORKDIR}" @@ -25,6 +26,9 @@ do_install() { install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish +# setup-live +install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live + # mdev install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev @@ -48,7 +52,8 @@ PACKAGES = "${PN}-base \ initr
[OE-core] [poky][master] [PATCH v5 0/1] initramfs-framework:configuration to boot up live image
From: "Ng, Wei Tee" Hi, This patch is to get initramfs-framework able to boot up live image. A new scriplet named setup-live module has been created to handle the removeable media detection and assign the rootfs.img. This is because the current rootfs module has no support for rootfs images, only rootfs partitions. This version 5 included the changes for re-correct the indenting issues and squashing 2 commits into single commit. It involve the creation of initramfs-module-setup-live in the recipe and added udev-extraconf rdepends on this module because it is needed for automounting process. This changes has been verified with build test and boot up test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-indent http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-indent Ng, Wei Tee (1): initramfs-framwork: module to support boot live image .../initrdscripts/initramfs-framework/setup-live | 66 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [poky][master] [PATCH v6 0/1] initramfs-framework:configuration to boot up live image
From: "Ng, Wei Tee" Hi, This patch is to get initramfs-framework able to boot up live image. A new scriplet named setup-live module has been created to handle the removeable media detection and assign the rootfs.img. This is because the current rootfs module has no support for rootfs images, only rootfs partitions. This version included the changes for typo, re-correct the indenting issues and squashing 2 commits into single commit. It involve the creation of initramfs-module-setup-live in the recipe and added udev-extraconf rdepends on this module because it is needed for automounting process. This changes has been verified with build test and boot up test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-final http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-final Ng, Wei Tee (1): initramfs-framework: module to support boot live image .../initrdscripts/initramfs-framework/setup-live | 66 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v6 1/1] initramfs-framework: module to support boot live image
From: "Ng, Wei Tee" setup-live module is a new module being introduced to integrate the functionality of init-live.sh into new scriptlet named setup-live in order to support the live boot image. The udev-extraconf rdepends is being added to perform automounting. It gets to run before the rootfs and finish module. The setup-live scriplet include the changes for: - Create a conditional loop for the bootparam_root variable. If it is not set, then it will boot from ROOT_IMAGE. Else, it will boot normally which is not from removable media. - Gives a standard path to the original boot disk mount which can be used to. While /media/sda is a good guess, it isn't always right, nor is it a good assumption that only one boot disk is in the system. - The current rootfs module has no support for rootfs images, currently it only support for rootfs partitions for wic image. Therefore, there is a need to assign the rootfs image for live image. [YOCTO #11701] Signed-off-by: Ng, Wei Tee --- This version is to re-correct the typo in the message. .../initrdscripts/initramfs-framework/setup-live | 66 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live new file mode 100644 index 000..ec4a139 --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -0,0 +1,66 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=30 + + if [ -z $bootparam_root ]; then + echo "Waiting for removable media..." + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo -n " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + C=$(( C + 1 )) + fi + sleep 1 + done + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + else + break + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 67a1b04..211e89d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -13,7 +13,8 @@ SRC_URI = "file://init \ file://mdev \ file://udev \ file://e2fs \ - file://debug" + file://debug \ + file://setup-live" S = "${WORKDIR}" @@ -25,6 +26,9 @@ do_install() { install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish +# setup-live +install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live + # mdev install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev @@ -48,7 +52,8 @@ PACKAGES = "${PN}-base \ initram
[OE-core] [poky][master][PATCH 0/1] initramfs-framework: include install module in recipe for installation
From: "Ng, Wei Tee" This patch is to enable the installation mechanism in initramfs-framework. It used the existing init-install-efi.sh script in the initrdscript and install a new module named initramfs-module-install in the recipe. I put all the changes as a single commit. This changes has been verified with build test, boot up test and installation test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 42ed3bedf773c1fee314a2e4194c9656c583cc9c: initramfs-framework: module to support boot live image (2017-07-12 12:19:09 -0700) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-install http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-install Ng, Wei Tee (1): initramfs-framework: include install module in recipe for installation .../initramfs-framework/init-install-efi.sh| 276 + .../initrdscripts/initramfs-framework_1.0.bb | 13 +- 2 files changed, 287 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/init-install-efi.sh -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] initramfs-framework: include install module in recipe for installation
From: "Ng, Wei Tee" Utilized the existing init-install-efi.sh script to manage the installation process of images in initramfs-framework model. This script will be executed when "install" option is being chosen in the grub menu and install the image on the target platform. A new install module is being added in the recipe to handle the installation process using initramfs-framework. [YOCTO #10989] Signed-off-by: Ng, Wei Tee --- .../initramfs-framework/init-install-efi.sh| 276 + .../initrdscripts/initramfs-framework_1.0.bb | 13 +- 2 files changed, 287 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/init-install-efi.sh diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/init-install-efi.sh b/meta/recipes-core/initrdscripts/initramfs-framework/init-install-efi.sh new file mode 100644 index 000..5ad3a60 --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/init-install-efi.sh @@ -0,0 +1,276 @@ +#!/bin/sh -e +# +# Copyright (c) 2012, Intel Corporation. +# All rights reserved. +# +# install.sh [device_name] [rootfs_name] +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +# We need 20 Mb for the boot partition +boot_size=20 + +# 5% for swap +swap_ratio=5 + +# Get a list of hard drives +hdnamelist="" +live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'` +live_dev_name=${live_dev_name#\/dev/} +# Only strip the digit identifier if the device is not an mmc +case $live_dev_name in +mmcblk*) +;; +nvme*) +;; +*) +live_dev_name=${live_dev_name%%[0-9]*} +;; +esac + +echo "Searching for hard drives ..." + +# Some eMMC devices have special sub devices such as mmcblk0boot0 etc +# we're currently only interested in the root device so pick them wisely +devices=`ls /sys/block/ | grep -v mmcblk` || true +mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true +devices="$devices $mmc_devices" + +for device in $devices; do +case $device in +loop*) +# skip loop device +;; +sr*) +# skip CDROM device +;; +ram*) +# skip ram device +;; +*) +# skip the device LiveOS is on +# Add valid hard drive name to the list +case $device in +$live_dev_name*) +# skip the device we are running from +;; +*) +hdnamelist="$hdnamelist $device" +;; +esac +;; +esac +done + +if [ -z "${hdnamelist}" ]; then +echo "You need another device (besides the live device /dev/${live_dev_name}) to install the image. Installation aborted." +exit 1 +fi + +TARGET_DEVICE_NAME="" +for hdname in $hdnamelist; do +# Display found hard drives and their basic info +echo "---" +echo /dev/$hdname +if [ -r /sys/block/$hdname/device/vendor ]; then +echo -n "VENDOR=" +cat /sys/block/$hdname/device/vendor +fi +if [ -r /sys/block/$hdname/device/model ]; then +echo -n "MODEL=" +cat /sys/block/$hdname/device/model +fi +if [ -r /sys/block/$hdname/device/uevent ]; then +echo -n "UEVENT=" +cat /sys/block/$hdname/device/uevent +fi +echo +done + +# Get user choice +while true; do +echo "Please select an install target or press n to exit ($hdnamelist ): " +read answer +if [ "$answer" = "n" ]; then +echo "Installation manually aborted." +exit 1 +fi +for hdname in $hdnamelist; do +if [ "$answer" = "$hdname" ]; then +TARGET_DEVICE_NAME=$answer +break +fi +done +if [ -n "$TARGET_DEVICE_NAME" ]; then +break +fi +done + +if [ -n "$TARGET_DEVICE_NAME" ]; then +echo "Installing image on /dev/$TARGET_DEVICE_NAME ..." +else +echo "No hard drive selected. Installation aborted." +exit 1 +fi + +device=/dev/$TARGET_DEVICE_NAME + +# +# The udev automounter can cause pain here, kill it +# +rm -f /etc/udev/rules.d/automount.rules +rm -f /etc/udev/scripts/mount* + +# +# Unmount anything the automounter had mounted +# +umount ${device}* 2> /dev/null || /bin/true + +mkdir -p /tmp + +# Create /etc/mtab if not present +if [ ! -e /etc/mtab ] && [ -e /proc/mounts ]; then +ln -sf /proc/mounts /etc/mtab +fi + +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") + +swap_size=$((disk_size*swap_ratio/100)) +rootfs_size=$((disk_size-boot_size-swap_size)) + +rootfs_start=$((boot_size)) +rootfs_end=$((rootfs_start+rootfs_size)) +swap_start=$((rootfs_end)) + +# MMC devices are special in a couple of ways +# 1) they use a partition prefix character 'p' +# 2) they are detected asynchronously (need rootwait) +rootwait="" +part_prefix="" +if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \ + [ ! "
[OE-core] [poky][master][PATCH v2 0/1] initramfs-framework: include install-efi module in recipe for installation
From: "Ng, Wei Tee" This patch is to enable the installation mechanism in initramfs-framework. It used the existing init-install-efi.sh script in the initrdscript and install a new module named initramfs-module-install-efi in the recipe. I put all the changes as a single commit. This version 2 had renamed the existing init-install-efi.sh to install-efi.sh and package name changed to install-efi. This patch shall encounter a patchtest failure as it is depends on a patch which have been sent to the mailing list and waiting for acceptance. The dependency patch can be found in here: http://lists.openembedded.org/pipermail/openembedded-core/2017-July/139570.html This changes has been verified with build test, boot up test and installation test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 42ed3bedf773c1fee314a2e4194c9656c583cc9c: initramfs-framework: module to support boot live image (2017-07-12 12:19:09 -0700) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib weiteeng/initramfs-install-efi http://git.yoctoproject.org/cgit.cgi//log/?h=weiteeng/initramfs-install-efi Ng, Wei Tee (1): initramfs-framework: include install-efi module in recipe for installation .../initramfs-framework/install-efi.sh | 276 + .../initrdscripts/initramfs-framework_1.0.bb | 13 +- 2 files changed, 287 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] initramfs-framework: include install-efi module in recipe for installation
From: "Ng, Wei Tee" Utilized the existing init-install-efi.sh script and renamed it to install-efi.sh to manage the installation process of images in initramfs-framework model. This script will be executed when "install" option is being chosen in the grub menu and install the image on the target platform. A new install-efi module is being added in the recipe to handle the installation process using initramfs-framework. [YOCTO #10989] Signed-off-by: Ng, Wei Tee --- This version is to rename init-install-efi.sh to install-efi.sh and package name to install-efi. .../initramfs-framework/install-efi.sh | 276 + .../initrdscripts/initramfs-framework_1.0.bb | 13 +- 2 files changed, 287 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh b/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh new file mode 100644 index 000..5ad3a60 --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh @@ -0,0 +1,276 @@ +#!/bin/sh -e +# +# Copyright (c) 2012, Intel Corporation. +# All rights reserved. +# +# install.sh [device_name] [rootfs_name] +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +# We need 20 Mb for the boot partition +boot_size=20 + +# 5% for swap +swap_ratio=5 + +# Get a list of hard drives +hdnamelist="" +live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'` +live_dev_name=${live_dev_name#\/dev/} +# Only strip the digit identifier if the device is not an mmc +case $live_dev_name in +mmcblk*) +;; +nvme*) +;; +*) +live_dev_name=${live_dev_name%%[0-9]*} +;; +esac + +echo "Searching for hard drives ..." + +# Some eMMC devices have special sub devices such as mmcblk0boot0 etc +# we're currently only interested in the root device so pick them wisely +devices=`ls /sys/block/ | grep -v mmcblk` || true +mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true +devices="$devices $mmc_devices" + +for device in $devices; do +case $device in +loop*) +# skip loop device +;; +sr*) +# skip CDROM device +;; +ram*) +# skip ram device +;; +*) +# skip the device LiveOS is on +# Add valid hard drive name to the list +case $device in +$live_dev_name*) +# skip the device we are running from +;; +*) +hdnamelist="$hdnamelist $device" +;; +esac +;; +esac +done + +if [ -z "${hdnamelist}" ]; then +echo "You need another device (besides the live device /dev/${live_dev_name}) to install the image. Installation aborted." +exit 1 +fi + +TARGET_DEVICE_NAME="" +for hdname in $hdnamelist; do +# Display found hard drives and their basic info +echo "---" +echo /dev/$hdname +if [ -r /sys/block/$hdname/device/vendor ]; then +echo -n "VENDOR=" +cat /sys/block/$hdname/device/vendor +fi +if [ -r /sys/block/$hdname/device/model ]; then +echo -n "MODEL=" +cat /sys/block/$hdname/device/model +fi +if [ -r /sys/block/$hdname/device/uevent ]; then +echo -n "UEVENT=" +cat /sys/block/$hdname/device/uevent +fi +echo +done + +# Get user choice +while true; do +echo "Please select an install target or press n to exit ($hdnamelist ): " +read answer +if [ "$answer" = "n" ]; then +echo "Installation manually aborted." +exit 1 +fi +for hdname in $hdnamelist; do +if [ "$answer" = "$hdname" ]; then +TARGET_DEVICE_NAME=$answer +break +fi +done +if [ -n "$TARGET_DEVICE_NAME" ]; then +break +fi +done + +if [ -n "$TARGET_DEVICE_NAME" ]; then +echo "Installing image on /dev/$TARGET_DEVICE_NAME ..." +else +echo "No hard drive selected. Installation aborted." +exit 1 +fi + +device=/dev/$TARGET_DEVICE_NAME + +# +# The udev automounter can cause pain here, kill it +# +rm -f /etc/udev/rules.d/automount.rules +rm -f /etc/udev/scripts/mount* + +# +# Unmount anything the automounter had mounted +# +umount ${device}* 2> /dev/null || /bin/true + +mkdir -p /tmp + +# Create /etc/mtab if not present +if [ ! -e /etc/mtab ] && [ -e /proc/mounts ]; then +ln -sf /proc/mounts /etc/mtab +fi + +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") + +swap_size=$((disk_size*swap_ratio/100)) +rootfs_size=$((disk_size-boot_size-swap_size)) + +rootfs_start=$((boot_size)) +rootfs_end=$((rootfs_start+rootfs_size)) +swap_start=$((rootfs_end)) + +# MMC devices are special in a couple of ways +# 1) they use a partition prefix character 'p' +# 2) they are detected asynchro
[OE-core] [PATCH 1/3] initramfs-framework: module to support boot live image
From: "Ng, Wei Tee" setup-live module is a new module being introduced to integrate the functionality of init-live.sh into new scriptlet named setup-live in order to support the live boot image. The udev-extraconf rdepends is being added to perform automounting. It gets to run before the rootfs and finish module. The setup-live scriplet include the changes for: - Create a conditional loop for the bootparam_root variable. If it is not set, then it will boot from ROOT_IMAGE. Else, it will boot normally which is not from removable media. - Gives a standard path to the original boot disk mount which can be used to. While /media/sda is a good guess, it isn't always right, nor is it a good assumption that only one boot disk is in the system. - The current rootfs module has no support for rootfs images, currently it only support for rootfs partitions for wic image. Therefore, there is a need to assign the rootfs image for live image. [YOCTO #11701] Signed-off-by: Ng, Wei Tee --- .../initrdscripts/initramfs-framework/setup-live | 66 ++ .../initrdscripts/initramfs-framework_1.0.bb | 13 - 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live new file mode 100644 index 000..ec4a139 --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -0,0 +1,66 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=30 + + if [ -z $bootparam_root ]; then + echo "Waiting for removable media..." + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo -n " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + C=$(( C + 1 )) + fi + sleep 1 + done + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + else + break + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 67a1b04..211e89d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -13,7 +13,8 @@ SRC_URI = "file://init \ file://mdev \ file://udev \ file://e2fs \ - file://debug" + file://debug \ + file://setup-live" S = "${WORKDIR}" @@ -25,6 +26,9 @@ do_install() { install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish +# setup-live +install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live + # mdev install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev @@ -48,7 +52,8 @@ PACKAGES = "${PN}-base \ initramfs-module-udev \ initramfs-module-e2fs \
[OE-core] [poky][master][PATCH 0/3] core-image-minimal-initramfs: use initramfs-framework for initialization by default
From: "Ng, Wei Tee" These patches is to initialize initramfs-framework by default. The initramfs-framework is able to boot up live image and enable the installation mechanism. For the configuration to boot up live image, a new scriplet named setup-live module has been created to handle the removeable media detection and assign the rootfs.img. This is because the current rootfs module has no support for rootfs images, only rootfs partitions. A new initramfs-module-setup-live recipe is being created and added udev-extraconf rdepends on this module because it is needed for automounting process. For the installation mechanism, it used the existing init-install-efi.sh script in the initrdscript and install a new module named initramfs-module-install-efi in the recipe. This changes has been verified with build test, boot up test and installation test on Minnowboard Max platform. Please review and provide feedback if you have any. The patches are targeted for merging into poky master branch. Thanks and regards, Wei Tee The following changes since commit 15901164ee71dec0906dadaff08f3365a66feb05: dev-manual, ref-manual: Eliminated pre-built section (2017-07-22 09:19:25 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib weiteeng/initramfs http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=weiteeng/initramfs Ng, Wei Tee (3): initramfs-framework: module to support boot live image initramfs-framework: include install-efi module in recipe for installation core-image-minimal-initramfs: use initramfs-framework by default .../images/core-image-minimal-initramfs.bb | 2 +- .../initramfs-framework/install-efi.sh | 276 + .../initrdscripts/initramfs-framework/setup-live | 66 + .../initrdscripts/initramfs-framework_1.0.bb | 28 ++- 4 files changed, 368 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/setup-live -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] initramfs-framework: include install-efi module in recipe for installation
From: "Ng, Wei Tee" Utilized the existing init-install-efi.sh script and renamed it to install-efi.sh to manage the installation process of images in initramfs-framework model. This script will be executed when "install" option is being chosen in the grub menu and install the image on the target platform. A new install-efi module is being added in the recipe to handle the installation process using initramfs-framework. [YOCTO #10989] Signed-off-by: Ng, Wei Tee --- This version solve the failure of the oe-selftest which is related to the allarch issues. .../initramfs-framework/install-efi.sh | 276 + .../initrdscripts/initramfs-framework_1.0.bb | 19 +- 2 files changed, 292 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh b/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh new file mode 100644 index 000..5ad3a60 --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh @@ -0,0 +1,276 @@ +#!/bin/sh -e +# +# Copyright (c) 2012, Intel Corporation. +# All rights reserved. +# +# install.sh [device_name] [rootfs_name] +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +# We need 20 Mb for the boot partition +boot_size=20 + +# 5% for swap +swap_ratio=5 + +# Get a list of hard drives +hdnamelist="" +live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'` +live_dev_name=${live_dev_name#\/dev/} +# Only strip the digit identifier if the device is not an mmc +case $live_dev_name in +mmcblk*) +;; +nvme*) +;; +*) +live_dev_name=${live_dev_name%%[0-9]*} +;; +esac + +echo "Searching for hard drives ..." + +# Some eMMC devices have special sub devices such as mmcblk0boot0 etc +# we're currently only interested in the root device so pick them wisely +devices=`ls /sys/block/ | grep -v mmcblk` || true +mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true +devices="$devices $mmc_devices" + +for device in $devices; do +case $device in +loop*) +# skip loop device +;; +sr*) +# skip CDROM device +;; +ram*) +# skip ram device +;; +*) +# skip the device LiveOS is on +# Add valid hard drive name to the list +case $device in +$live_dev_name*) +# skip the device we are running from +;; +*) +hdnamelist="$hdnamelist $device" +;; +esac +;; +esac +done + +if [ -z "${hdnamelist}" ]; then +echo "You need another device (besides the live device /dev/${live_dev_name}) to install the image. Installation aborted." +exit 1 +fi + +TARGET_DEVICE_NAME="" +for hdname in $hdnamelist; do +# Display found hard drives and their basic info +echo "---" +echo /dev/$hdname +if [ -r /sys/block/$hdname/device/vendor ]; then +echo -n "VENDOR=" +cat /sys/block/$hdname/device/vendor +fi +if [ -r /sys/block/$hdname/device/model ]; then +echo -n "MODEL=" +cat /sys/block/$hdname/device/model +fi +if [ -r /sys/block/$hdname/device/uevent ]; then +echo -n "UEVENT=" +cat /sys/block/$hdname/device/uevent +fi +echo +done + +# Get user choice +while true; do +echo "Please select an install target or press n to exit ($hdnamelist ): " +read answer +if [ "$answer" = "n" ]; then +echo "Installation manually aborted." +exit 1 +fi +for hdname in $hdnamelist; do +if [ "$answer" = "$hdname" ]; then +TARGET_DEVICE_NAME=$answer +break +fi +done +if [ -n "$TARGET_DEVICE_NAME" ]; then +break +fi +done + +if [ -n "$TARGET_DEVICE_NAME" ]; then +echo "Installing image on /dev/$TARGET_DEVICE_NAME ..." +else +echo "No hard drive selected. Installation aborted." +exit 1 +fi + +device=/dev/$TARGET_DEVICE_NAME + +# +# The udev automounter can cause pain here, kill it +# +rm -f /etc/udev/rules.d/automount.rules +rm -f /etc/udev/scripts/mount* + +# +# Unmount anything the automounter had mounted +# +umount ${device}* 2> /dev/null || /bin/true + +mkdir -p /tmp + +# Create /etc/mtab if not present +if [ ! -e /etc/mtab ] && [ -e /proc/mounts ]; then +ln -sf /proc/mounts /etc/mtab +fi + +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") + +swap_size=$((disk_size*swap_ratio/100)) +rootfs_size=$((disk_size-boot_size-swap_size)) + +rootfs_start=$((boot_size)) +rootfs_end=$((rootfs_start+rootfs_size)) +swap_start=$((rootfs_end)) + +# MMC devices are special in a couple of ways +# 1) they use a partition prefix character 'p' +# 2) they are detected asynchronously
[OE-core] [PATCH 3/3] core-image-minimal-initramfs: use initramfs-framework by default
From: "Ng, Wei Tee" Use the initramfs-framework for initialization by default due to the modularity and expansibility. [YOCTO #10987] Signed-off-by: Ng, Wei Tee --- meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 5794a25..c1f2855 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ first 'init' program more efficiently." -PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" +PACKAGE_INSTALL = "initramfs-framework-base initramfs-module-udev initramfs-module-setup-live initramfs-module-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4][YOCTO #11090] Set linux-firmware to correct license
From: "Ng, Wei Tee" These patches is to update the SRCREV of linux-firmware to the latest HEAD and set the license file explicitly for linux-firmware-carl9170 to GPL-2. The SRCREV for linux-firmware was updated to the latest in order to include the GPL-2 license file. The netronome firmware was removed until rpm packaging issue is resolved. This configuration are build and tested. Please review and provide feedback if you have any. Thanks. Regards, Wei Tee Chang, Rebecca Swee Fun (1): linux-firmware: Fix build failure when update SRCREV to latest HEAD Ng, Wei Tee (2): linux-firmware: update to revision a4dde74b linux-firmware: Set the license for carl9170 to GPLv2 Peter Kjellerstedt (1): bitbake: fetch2: Do not fail to create symbolic links if they already exist bitbake/lib/bb/fetch2/__init__.py | 15 ++-- .../linux-firmware/linux-firmware_git.bb | 40 ++ 2 files changed, 38 insertions(+), 17 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] bitbake: fetch2: Do not fail to create symbolic links if they already exist
From: Peter Kjellerstedt When the fetcher retrieves file:// URLs, there is no lock file being used. This means that in case two separate tasks (typically from two concurrent invocations of bitbake) want to download the same file:// URL at the same time, there is a very small chance that they also end up wanting to create a symbolic link to the file at the same time. This would previously lead to one of the tasks failing as the other task would have created the link. (Bitbake rev: 58a03531c8183b165bb7dcad86d8559c92bc150d) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index ea72025..136fc29 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -983,7 +983,14 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): open(ud.donestamp, 'w').close() dest = os.path.join(dldir, os.path.basename(ud.localpath)) if not os.path.exists(dest): -os.symlink(ud.localpath, dest) +# In case this is executing without any file locks held (as is +# the case for file:// URLs), two tasks may end up here at the +# same time, in which case we do not want the second task to +# fail when the link has already been created by the first task. +try: +os.symlink(ud.localpath, dest) +except FileExistsError: +pass if not verify_donestamp(origud, ld) or origud.method.need_update(origud, ld): origud.method.download(origud, ld) if hasattr(origud.method,"build_mirror_data"): @@ -995,7 +1002,11 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): # Broken symbolic link os.unlink(origud.localpath) -os.symlink(ud.localpath, origud.localpath) +# As per above, in case two tasks end up here simultaneously. +try: +os.symlink(ud.localpath, origud.localpath) +except FileExistsError: +pass update_stamp(origud, ld) return ud.localpath -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] linux-firmware: Fix build failure when update SRCREV to latest HEAD
From: "Chang, Rebecca Swee Fun" When we update the SRCREV to latest, we will encouter the following bitbake error. Build error message: | Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 | error: Arch dependent binaries in noarch package | | | RPM build errors: | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0081-0001_1x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0099-0001_2x25.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_8x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0081-0001_4x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_4x10_1x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0099-0001_2x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_2x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0096-0001_2x10.nffw | Deprecated external dependency generator is used! | Arch dependent binaries in noarch package | WARNING: exit code 1 from a shell command. This is due to netronome firmware is not included in noarch package. Hence we removed the netronome firmware before it is packaged, until the rpm issue is resolved. Signed-off-by: Chang, Rebecca Swee Fun Signed-off-by: Ng, Wei Tee --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 9497531..3eb3bce 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -112,7 +112,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=4c56371b1c0d9e75f7620563c652b566 \ +file://WHENCE;md5=ad12d0618287e8c10ae3da05fa0edcfb \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -172,7 +172,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "a4dde74b504522d239e8521617b53b03f393ed6a" +SRCREV = "b14134583c2a15d4404695f72cb523daedb877ab" PE = "1" PV = "0.0+git${SRCPV}" @@ -216,6 +216,9 @@ do_install() { # Copy the iwlwifi ucode cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/ + + # TODO: Remove netronome firmware until RPM packaging issue is resolved + rm -r ${D}${nonarch_base_libdir}/firmware/netronome/ } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] linux-firmware: Set the license for carl9170 to GPLv2
From: "Ng, Wei Tee" linux-firmwara-carl9170 was set to a wrong license string. Carl9170 firmware is bounded by GPLv2 via code inspection on linux firmware source tree. Hence we include GPLv2 in LICENSE field and set carl9170 firmware to the correct license. [YOCTO #11090] Signed-off-by: Ng, Wei Tee --- .../linux-firmware/linux-firmware_git.bb| 21 - 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index be82a63..9497531 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -19,6 +19,7 @@ LICENSE = "\ & Firmware-ene_firmware \ & Firmware-fw_sst_0f28 \ & Firmware-go7007 \ +& Firmware-GPL-2 \ & Firmware-hfi1_firmware \ & Firmware-i2400m \ & Firmware-i915 \ @@ -75,6 +76,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \ +file://GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ @@ -132,6 +134,7 @@ NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100" NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28" NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007" +NO_GENERIC_LICENSE[Firmware-GPL-2] = "GPL-2" NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m" NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" @@ -223,7 +226,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \ - ${PN}-atheros-license ${PN}-ar9170 ${PN}-carl9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-GPL-2-license ${PN}-carl9170 \ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \ \ ${PN}-iwlwifi-license ${PN}-iwlwifi \ @@ -253,9 +257,6 @@ FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_f FILES_${PN}-ar9170 = " \ ${nonarch_base_libdir}/firmware/ar9170*.fw \ " -FILES_${PN}-carl9170 = " \ - ${nonarch_base_libdir}/firmware/carl9170*.fw \ -" FILES_${PN}-ath6k = " \ ${nonarch_base_libdir}/firmware/ath6k \ " @@ -269,10 +270,20 @@ FILES_${PN}-ath9k = " \ " RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" -RDEPENDS_${PN}-carl9170 += "${PN}-atheros-license" RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" +# For carl9170 +LICENSE_${PN}-carl9170 = "Firmware-GPL-2" +LICENSE_${PN}-GPL-2-license = "Firmware-GPL-2" + +FILES_${PN}-GPL-2-license = "${nonarch_base_libdir}/firmware/GPL-2" +FILES_${PN}-carl9170 = " \ + ${nonarch_base_libdir}/firmware/carl9170*.fw \ +" + +RDEPENDS_${PN}-carl9170 += "${PN}-GPL-2-license" + # For QualCommAthos LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] linux-firmware: update to revision a4dde74b
From: "Ng, Wei Tee" -change in amdgpu firmware copyright year -change in radeon firmware copyright year -LICENCE.mwl8335 was removed in linux-firmware source tree -specify the copyright year for siano -change in qla2xxx firmware copyright year Signed-off-by: Ng, Wei Tee --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index d393231..be82a63 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -29,7 +29,6 @@ LICENSE = "\ & Firmware-kaweth \ & Firmware-Marvell \ & Firmware-moxa \ -& Firmware-mwl8335 \ & Firmware-myri10ge_firmware \ & Firmware-nvidia \ & Firmware-OLPC \ @@ -62,7 +61,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ -file://LICENSE.amdgpu;md5=3fe8a3430700a518990c3b3d75297209 \ +file://LICENSE.amdgpu;md5=0aa3c2f3e736af320a08a3aeeccecf29 \ file://LICENSE.amd-ucode;md5=3a0de451253cc1edbf30a3c621effee3 \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ @@ -86,7 +85,6 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ -file://LICENCE.mwl8335;md5=9a6271ee0e644404b2ff3c61fd070983 \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ @@ -94,15 +92,15 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ -file://LICENCE.qla2xxx;md5=f5ce8529ec5c17cb7f911d2721d90e91 \ +file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ file://LICENSE.QualcommAtheros_ath10k;md5=b5fe244fb2b532311de1472a3bc06da5 \ file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ -file://LICENSE.radeon;md5=69612f4f7b141a97659cb1d609a1bde2 \ +file://LICENSE.radeon;md5=68ec28bacb3613200bca44f404c69b16 \ file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \ file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ -file://LICENCE.siano;md5=602c79ae3f98f1e73d880fd9f940a418 \ +file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0695c7d9103e \ file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ @@ -112,7 +110,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=f514a0c53c5d73c2fe98d5861103f0c6 \ +file://WHENCE;md5=4c56371b1c0d9e75f7620563c652b566 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -144,7 +142,6 @@ NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" -NO_GENERIC_LICENSE[Firmware-mwl8335] = "LICENCE.mwl8335" NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" @@ -172,7 +169,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "42ad5367dd38371b2a1bb263b6efa85f9b92fc93" +SRCREV = "a4dde74b504522d239e8521617b53b03f393ed6a" PE = "1" PV = "0.0+git${SRCPV}" @@ -598,7 +595,6 @@ LICENSE_${PN} = "\ & Firmware-IntcSST2 \ & Firmware-kaweth \ & Firmware-moxa \ -& Firmware-mwl8335 \ & Firmware-myri10ge_firmware \ & Firmware-nvidia \ & Firmware-OLPC \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.or
[OE-core] [PATCH v2 0/3][YOCTO #11090] Set linux-firmware to correct license
From: "Ng, Wei Tee" These patches is to update the SRCREV of linux-firmware to the latest HEAD and set thelicense file explicitly for linux-firmware-carl9170 to GPL-2. The SRCREV for linux-firmware was updated to the latest in order to include the GPL-2 license file. The netronome firmware was removed until rpm packaging issue is resolved. This configuration are build and tested. Please review and provide feedback if you have any. Thanks. Regards, Wei Tee Chang, Rebecca Swee Fun (1): linux-firmware: Fix build failure when update SRCREV to latest HEAD Ng, Wei Tee (2): linux-firmware: update to revision a4dde74b linux-firmware: Set the license for carl9170 to GPLv2 .../linux-firmware/linux-firmware_git.bb | 40 ++ 1 file changed, 25 insertions(+), 15 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/3] linux-firmware: update to revision a4dde74b
From: "Ng, Wei Tee" -change in amdgpu firmware copyright year -change in radeon firmware copyright year -LICENCE.mwl8335 was removed in linux-firmware source tree -specify the copyright year for siano -change in qla2xxx firmware copyright year Signed-off-by: Ng, Wei Tee --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index d393231..be82a63 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -29,7 +29,6 @@ LICENSE = "\ & Firmware-kaweth \ & Firmware-Marvell \ & Firmware-moxa \ -& Firmware-mwl8335 \ & Firmware-myri10ge_firmware \ & Firmware-nvidia \ & Firmware-OLPC \ @@ -62,7 +61,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ -file://LICENSE.amdgpu;md5=3fe8a3430700a518990c3b3d75297209 \ +file://LICENSE.amdgpu;md5=0aa3c2f3e736af320a08a3aeeccecf29 \ file://LICENSE.amd-ucode;md5=3a0de451253cc1edbf30a3c621effee3 \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ @@ -86,7 +85,6 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ -file://LICENCE.mwl8335;md5=9a6271ee0e644404b2ff3c61fd070983 \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ @@ -94,15 +92,15 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ -file://LICENCE.qla2xxx;md5=f5ce8529ec5c17cb7f911d2721d90e91 \ +file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ file://LICENSE.QualcommAtheros_ath10k;md5=b5fe244fb2b532311de1472a3bc06da5 \ file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ -file://LICENSE.radeon;md5=69612f4f7b141a97659cb1d609a1bde2 \ +file://LICENSE.radeon;md5=68ec28bacb3613200bca44f404c69b16 \ file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \ file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ -file://LICENCE.siano;md5=602c79ae3f98f1e73d880fd9f940a418 \ +file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0695c7d9103e \ file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ @@ -112,7 +110,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=f514a0c53c5d73c2fe98d5861103f0c6 \ +file://WHENCE;md5=4c56371b1c0d9e75f7620563c652b566 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -144,7 +142,6 @@ NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" -NO_GENERIC_LICENSE[Firmware-mwl8335] = "LICENCE.mwl8335" NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" @@ -172,7 +169,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "42ad5367dd38371b2a1bb263b6efa85f9b92fc93" +SRCREV = "a4dde74b504522d239e8521617b53b03f393ed6a" PE = "1" PV = "0.0+git${SRCPV}" @@ -598,7 +595,6 @@ LICENSE_${PN} = "\ & Firmware-IntcSST2 \ & Firmware-kaweth \ & Firmware-moxa \ -& Firmware-mwl8335 \ & Firmware-myri10ge_firmware \ & Firmware-nvidia \ & Firmware-OLPC \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.or
[OE-core] [PATCH v2 3/3] linux-firmware: Fix build failure when update SRCREV to latest HEAD
From: "Chang, Rebecca Swee Fun" When we update the SRCREV to latest, we will encouter the following bitbake error. Build error message: | Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 | error: Arch dependent binaries in noarch package | | | RPM build errors: | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0081-0001_1x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0099-0001_2x25.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_8x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0081-0001_4x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_4x10_1x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0099-0001_2x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_2x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0096-0001_2x10.nffw | Deprecated external dependency generator is used! | Arch dependent binaries in noarch package | WARNING: exit code 1 from a shell command. This is due to netronome firmware is not included in noarch package. Hence we removed the netronome firmware before it is packaged, until the rpm issue is resolved. Signed-off-by: Chang, Rebecca Swee Fun Signed-off-by: Ng, Wei Tee --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 9497531..3eb3bce 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -112,7 +112,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=4c56371b1c0d9e75f7620563c652b566 \ +file://WHENCE;md5=ad12d0618287e8c10ae3da05fa0edcfb \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -172,7 +172,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "a4dde74b504522d239e8521617b53b03f393ed6a" +SRCREV = "b14134583c2a15d4404695f72cb523daedb877ab" PE = "1" PV = "0.0+git${SRCPV}" @@ -216,6 +216,9 @@ do_install() { # Copy the iwlwifi ucode cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/ + + # TODO: Remove netronome firmware until RPM packaging issue is resolved + rm -r ${D}${nonarch_base_libdir}/firmware/netronome/ } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/3] linux-firmware: Set the license for carl9170 to GPLv2
From: "Ng, Wei Tee" linux-firmwara-carl9170 was set to a wrong license string. Carl9170 firmware is bounded by GPLv2 via code inspection on linux firmware source tree. Hence we include GPLv2 in LICENSE field and set carl9170 firmware to the correct license. [YOCTO #11090] Signed-off-by: Ng, Wei Tee --- .../linux-firmware/linux-firmware_git.bb| 21 - 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index be82a63..9497531 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -19,6 +19,7 @@ LICENSE = "\ & Firmware-ene_firmware \ & Firmware-fw_sst_0f28 \ & Firmware-go7007 \ +& Firmware-GPL-2 \ & Firmware-hfi1_firmware \ & Firmware-i2400m \ & Firmware-i915 \ @@ -75,6 +76,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \ +file://GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ @@ -132,6 +134,7 @@ NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100" NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28" NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007" +NO_GENERIC_LICENSE[Firmware-GPL-2] = "GPL-2" NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m" NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" @@ -223,7 +226,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \ - ${PN}-atheros-license ${PN}-ar9170 ${PN}-carl9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-GPL-2-license ${PN}-carl9170 \ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \ \ ${PN}-iwlwifi-license ${PN}-iwlwifi \ @@ -253,9 +257,6 @@ FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_f FILES_${PN}-ar9170 = " \ ${nonarch_base_libdir}/firmware/ar9170*.fw \ " -FILES_${PN}-carl9170 = " \ - ${nonarch_base_libdir}/firmware/carl9170*.fw \ -" FILES_${PN}-ath6k = " \ ${nonarch_base_libdir}/firmware/ath6k \ " @@ -269,10 +270,20 @@ FILES_${PN}-ath9k = " \ " RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" -RDEPENDS_${PN}-carl9170 += "${PN}-atheros-license" RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" +# For carl9170 +LICENSE_${PN}-carl9170 = "Firmware-GPL-2" +LICENSE_${PN}-GPL-2-license = "Firmware-GPL-2" + +FILES_${PN}-GPL-2-license = "${nonarch_base_libdir}/firmware/GPL-2" +FILES_${PN}-carl9170 = " \ + ${nonarch_base_libdir}/firmware/carl9170*.fw \ +" + +RDEPENDS_${PN}-carl9170 += "${PN}-GPL-2-license" + # For QualCommAthos LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/3] linux-firmware: update to revision a4dde74b
From: "Ng, Wei Tee" -change in amdgpu firmware copyright year -change in radeon firmware copyright year -LICENCE.mwl8335 was removed in linux-firmware source tree -specify the copyright year for siano -change in qla2xxx firmware copyright year Signed-off-by: Ng, Wei Tee --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index d393231..be82a63 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -29,7 +29,6 @@ LICENSE = "\ & Firmware-kaweth \ & Firmware-Marvell \ & Firmware-moxa \ -& Firmware-mwl8335 \ & Firmware-myri10ge_firmware \ & Firmware-nvidia \ & Firmware-OLPC \ @@ -62,7 +61,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ -file://LICENSE.amdgpu;md5=3fe8a3430700a518990c3b3d75297209 \ +file://LICENSE.amdgpu;md5=0aa3c2f3e736af320a08a3aeeccecf29 \ file://LICENSE.amd-ucode;md5=3a0de451253cc1edbf30a3c621effee3 \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ @@ -86,7 +85,6 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ -file://LICENCE.mwl8335;md5=9a6271ee0e644404b2ff3c61fd070983 \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ @@ -94,15 +92,15 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ -file://LICENCE.qla2xxx;md5=f5ce8529ec5c17cb7f911d2721d90e91 \ +file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ file://LICENSE.QualcommAtheros_ath10k;md5=b5fe244fb2b532311de1472a3bc06da5 \ file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ -file://LICENSE.radeon;md5=69612f4f7b141a97659cb1d609a1bde2 \ +file://LICENSE.radeon;md5=68ec28bacb3613200bca44f404c69b16 \ file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \ file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ -file://LICENCE.siano;md5=602c79ae3f98f1e73d880fd9f940a418 \ +file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0695c7d9103e \ file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ @@ -112,7 +110,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=f514a0c53c5d73c2fe98d5861103f0c6 \ +file://WHENCE;md5=4c56371b1c0d9e75f7620563c652b566 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -144,7 +142,6 @@ NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" -NO_GENERIC_LICENSE[Firmware-mwl8335] = "LICENCE.mwl8335" NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" @@ -172,7 +169,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "42ad5367dd38371b2a1bb263b6efa85f9b92fc93" +SRCREV = "a4dde74b504522d239e8521617b53b03f393ed6a" PE = "1" PV = "0.0+git${SRCPV}" @@ -598,7 +595,6 @@ LICENSE_${PN} = "\ & Firmware-IntcSST2 \ & Firmware-kaweth \ & Firmware-moxa \ -& Firmware-mwl8335 \ & Firmware-myri10ge_firmware \ & Firmware-nvidia \ & Firmware-OLPC \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.or
[OE-core] [PATCH v3 0/3] Set linux-firmware to correct license
From: "Ng, Wei Tee" This is the revised version to fix the ipk packaging error as below: ERROR: linux-firmware-1_0.0+gitAUTOINC+b14134583c-r0 do_package_write_ipk: Function failed: do_package_ipk These patches is to update the SRCREV of linux-firmware to the latest HEAD and set the license file explicitly for linux-firmware-carl9170 to GPL-2. This also targeted to solve the Bugzilla ID 11090. The SRCREV for linux-firmware was updated to the latest in order to include the GPL-2 license file. The netronome firmware was removed until rpm packaging issue is resolved. This configuration are build and tested for ipk, rpm and deb packaging. Please review and provide feedback if you have any. Thanks. Regards, Wei Tee Chang, Rebecca Swee Fun (1): linux-firmware: Fix build failure when update SRCREV to latest HEAD Ng, Wei Tee (2): linux-firmware: update to revision a4dde74b linux-firmware: Set the license for carl9170 to GPLv2 .../linux-firmware/linux-firmware_git.bb | 40 ++ 1 file changed, 25 insertions(+), 15 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/3] linux-firmware: Set the license for carl9170 to GPLv2
From: "Ng, Wei Tee" linux-firmwara-carl9170 was set to a wrong license string. Carl9170 firmware is bounded by GPLv2 via code inspection on linux firmware source tree. Hence we include GPLv2 in LICENSE field and set carl9170 firmware to the correct license. [YOCTO #11090] Signed-off-by: Ng, Wei Tee --- .../linux-firmware/linux-firmware_git.bb| 21 - 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index be82a63..7b43c25 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -19,6 +19,7 @@ LICENSE = "\ & Firmware-ene_firmware \ & Firmware-fw_sst_0f28 \ & Firmware-go7007 \ +& Firmware-GPLv2 \ & Firmware-hfi1_firmware \ & Firmware-i2400m \ & Firmware-i915 \ @@ -75,6 +76,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \ +file://GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ @@ -132,6 +134,7 @@ NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100" NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28" NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007" +NO_GENERIC_LICENSE[Firmware-GPLv2] = "GPL-2" NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m" NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" @@ -223,7 +226,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \ - ${PN}-atheros-license ${PN}-ar9170 ${PN}-carl9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-gplv2-license ${PN}-carl9170 \ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \ \ ${PN}-iwlwifi-license ${PN}-iwlwifi \ @@ -253,9 +257,6 @@ FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_f FILES_${PN}-ar9170 = " \ ${nonarch_base_libdir}/firmware/ar9170*.fw \ " -FILES_${PN}-carl9170 = " \ - ${nonarch_base_libdir}/firmware/carl9170*.fw \ -" FILES_${PN}-ath6k = " \ ${nonarch_base_libdir}/firmware/ath6k \ " @@ -269,10 +270,20 @@ FILES_${PN}-ath9k = " \ " RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" -RDEPENDS_${PN}-carl9170 += "${PN}-atheros-license" RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" +# For carl9170 +LICENSE_${PN}-carl9170 = "Firmware-GPLv2" +LICENSE_${PN}-gplv2-license = "Firmware-GPLv2" + +FILES_${PN}-gplv2-license = "${nonarch_base_libdir}/firmware/GPL-2" +FILES_${PN}-carl9170 = " \ + ${nonarch_base_libdir}/firmware/carl9170*.fw \ +" + +RDEPENDS_${PN}-carl9170 += "${PN}-gplv2-license" + # For QualCommAthos LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/3] linux-firmware: Fix build failure when update SRCREV to latest HEAD
From: "Chang, Rebecca Swee Fun" When we update the SRCREV to latest, we will encouter the following bitbake error. Build error message: | Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 | error: Arch dependent binaries in noarch package | | | RPM build errors: | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0081-0001_1x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0099-0001_2x25.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_8x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0081-0001_4x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_4x10_1x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0099-0001_2x10.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0097-0001_2x40.nffw | Missing build-id in /home/phoongst/work2/test00/tmp/work/all-poky-linux/linux-firmware/1_0.0+gitAUTOINC+44d8e8d4fd-r0/package/lib/firmware/netronome/nic_AMDA0096-0001_2x10.nffw | Deprecated external dependency generator is used! | Arch dependent binaries in noarch package | WARNING: exit code 1 from a shell command. This is due to netronome firmware is not included in noarch package. Hence we removed the netronome firmware before it is packaged, until the rpm issue is resolved. Signed-off-by: Chang, Rebecca Swee Fun Signed-off-by: Ng, Wei Tee --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 7b43c25..be5bdbd 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -112,7 +112,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=4c56371b1c0d9e75f7620563c652b566 \ +file://WHENCE;md5=ad12d0618287e8c10ae3da05fa0edcfb \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -172,7 +172,7 @@ NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "a4dde74b504522d239e8521617b53b03f393ed6a" +SRCREV = "b14134583c2a15d4404695f72cb523daedb877ab" PE = "1" PV = "0.0+git${SRCPV}" @@ -216,6 +216,9 @@ do_install() { # Copy the iwlwifi ucode cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/ + + # TODO: Remove netronome firmware until RPM packaging issue is resolved + rm -r ${D}${nonarch_base_libdir}/firmware/netronome/ } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] rpm: allow arch-dependent binaries in noarch packages
From: Ng Wei Tee This patch is to handle the packaging of arch specific firmware in allarch way. In this case, the netronome binaries has ELF headers which is arch specific firmware. This is targeted to solve Bugzilla ID 11329. Besides that, the netronome firmware is packaged in a new package with a new license setup. This configuration are build and tested for ipk, rpm and deb packaging. Please review and provide feedbaack if you have any. Thank you. Regards, Wei Tee Ng Wei Tee (2): rpm: allow arch-dependent binaries in noarch packages linux-firmware: enable netronome firmware meta/classes/package_rpm.bbclass | 1 + .../linux-firmware/linux-firmware_git.bb | 25 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] linux-firmware: enable netronome firmware
From: Ng Wei Tee It was previously disabled, as rpm refused to package it into noarch package, due to the firmware being considered arch-specific. This check is disabled in rpm now. The netronome binaries has ELF headers which will trigger an arch-specific error. INSANE_SKIP variable is used to skip some package_qa check usage. Signed-off-by: Ng Wei Tee --- .../linux-firmware/linux-firmware_git.bb | 25 +++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index be5bdbd..a1b7065 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -31,6 +31,7 @@ LICENSE = "\ & Firmware-Marvell \ & Firmware-moxa \ & Firmware-myri10ge_firmware \ +& Firmware-netronome \ & Firmware-nvidia \ & Firmware-OLPC \ & Firmware-ath9k-htc \ @@ -88,6 +89,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ +file://LICENCE.Netronome;md5=cd2a3e6effe3cdf42731575b8e9477ed \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ @@ -146,6 +148,7 @@ NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" +NO_GENERIC_LICENSE[Firmware-netronome] = "LICENCE.Netronome" NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware" @@ -216,9 +219,6 @@ do_install() { # Copy the iwlwifi ucode cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}${nonarch_base_libdir}/firmware/ - - # TODO: Remove netronome firmware until RPM packaging issue is resolved - rm -r ${D}${nonarch_base_libdir}/firmware/netronome/ } @@ -246,6 +246,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-i915-license ${PN}-i915 \ ${PN}-adsp-sst-license ${PN}-adsp-sst \ ${PN}-bnx2-mips \ + ${PN}-netronome-license ${PN}-netronome \ ${PN}-whence-license \ ${PN}-license \ " @@ -371,6 +372,21 @@ RDEPENDS_${PN}-sd8801 += "${PN}-marvell-license" RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license" RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license" +# For netronome +LICENSE_${PN}-netronome = "Firmware-netronome" + +FILES_${PN}-netronome-license = " \ + ${nonarch_base_libdir}/firmware/LICENCE.Netronome \ +" +FILES_${PN}-netronome = " \ + ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0081*.nffw \ + ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \ + ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \ + ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0099*.nffw \ +" + +RDEPENDS_${PN}-netronome += "${PN}-netronome-license" + # For rtl LICENSE_${PN}-rtl8188 = "Firmware-rtlwifi_firmware" LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware" @@ -647,3 +663,6 @@ python populate_packages_prepend () { iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) d.appendVar('RDEPENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) } + +# Netronome binaries has ELF headers and therefore triggers an arch-specific error. +INSANE_SKIP_${PN}-netronome = "arch" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] rpm: allow arch-dependent binaries in noarch packages
From: Ng Wei Tee This is needed for packages like linux-firmware which have a legitimate reason for it. Oe-core has a separate package_qa test for this situation, so any accidental inclusions of such binaries will still be caught. [YOCTO #11329] Signed-off-by: Ng Wei Tee --- meta/classes/package_rpm.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 084546f..a844c4d 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -643,6 +643,7 @@ python do_package_rpm () { cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" cmd = cmd + " --define '_use_internal_dependency_generator 0'" +cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" if perfiledeps: cmd = cmd + " --define '__find_requires " + outdepends + "'" cmd = cmd + " --define '__find_provides " + outprovides + "'" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core