From patchwork Sat Mar 3 01:46:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 130586 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp211633lja; Fri, 2 Mar 2018 17:47:16 -0800 (PST) X-Google-Smtp-Source: AG47ELvy4wUlCpY9h6T/Xm8FAjFhOZCjaRoLBEF/Ue2Jkzq4MPp34T4XN7XKyKBNwdCB2RCBFREd X-Received: by 10.98.192.74 with SMTP id x71mr7403750pff.21.1520041636833; Fri, 02 Mar 2018 17:47:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520041636; cv=none; d=google.com; s=arc-20160816; b=WQqw+oxr0bx2HeqBi8q2SX5dxu0kPtUb70M/NDAV4aGqyVBAayqZ+iCc/qQjou68gb JD3KipH5CAPQuC8Fe1aHPcksi8WNAbuHEmX/J+bzH6Nzf9uT+fCavqPDLyWhirMp40Af YYRr2KFmZj3OA96pCKJgpz0fvSDzWToksEzT5cpWqsARCUSJCFzy3Ibi/54bJZFR4M53 TINp5SZqmrp9EDsEgrWCm1KYm9RHtF7Kbjy6YH6VbpJ3ipVnIdeM0Q0S+n7wCcB8d9Iq wamLlXtt0/jKnwJ3U28zYqJFmzIYzopnBW2lBNeoGcGvTEP+dtooHYHNK1Z0+UNKbx4N nOEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to :arc-authentication-results; bh=a5oS7NSZaJ8cxrMpxSAsNhcZQraTYNmc5G2JPH7w0t0=; b=UaEKjd6qbxfYSDAy1b1LxBCLW99WNfEKJ0bmCa+df6r6yt/v4AJUDCcSopeH/bujbo o9aMsU+RoDrQeV8n8Z157coyeruN/KJ5Qgf4kCqMMTEsgfODNgpiTUTqgG2qI2NAedbs qrBDtEFgAfcHAf6Uf42pT1+io1/4bOsBK2BdTlVtPGlD+UpltJWhzsWbKtNMF4vNCTmW R2+LrFgAinCpR1iKaumOQiseGjLBiIlqlH45iY4nILVqrSJsKnB8VG9rVy5U3vsmw3kJ vI+7l8eC8qzETLK0UJmLpXqL0q+9KERDROvQ3ifpAwAC/tXr9poDExjXtkJCkhIKUyVt 0rcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u2si1727981pfd.201.2018.03.02.17.47.16; Fri, 02 Mar 2018 17:47:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C3387789C8; Sat, 3 Mar 2018 01:47:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by mail.openembedded.org (Postfix) with ESMTP id 594A2789C2 for ; Sat, 3 Mar 2018 01:46:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 3C06620B81; Sat, 3 Mar 2018 01:47:01 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K12janzCtVtc; Sat, 3 Mar 2018 01:47:01 +0000 (UTC) Received: from mail.denix.org (pool-100-15-85-143.washdc.fios.verizon.net [100.15.85.143]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 0E18720B67; Sat, 3 Mar 2018 01:46:59 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id 4B7B71632DF; Fri, 2 Mar 2018 20:46:59 -0500 (EST) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Fri, 2 Mar 2018 20:46:50 -0500 Message-Id: <1520041611-39622-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Denys Dmytriyenko Subject: [OE-core] [PATCH 1/2] busybox: separate inittab into own package, due to SERIAL_CONSOLES being machine-specific X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Denys Dmytriyenko * Create busybox-inittab recipe to produce machine-specific package with /etc/inittab and necessary getty calls for a machine, based on SERIAL_CONSOLES, similar to how sysvinit-inittab was done * Since CONFIG_FEATURE_USE_INITTAB is controlled by VIRTUAL-RUNTIME_init_manager, make main busybox package RDEPENDS on busybox-inittab when init_manager is set to busybox Signed-off-by: Denys Dmytriyenko --- .../recipes-core/busybox/busybox-inittab_1.27.2.bb | 32 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox.inc | 12 ++------ 2 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox-inittab_1.27.2.bb -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/busybox/busybox-inittab_1.27.2.bb b/meta/recipes-core/busybox/busybox-inittab_1.27.2.bb new file mode 100644 index 0000000..a83620e --- /dev/null +++ b/meta/recipes-core/busybox/busybox-inittab_1.27.2.bb @@ -0,0 +1,32 @@ +SUMMARY = "inittab configuration for BusyBox" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI = "file://inittab" + +S = "${WORKDIR}" + +INHIBIT_DEFAULT_DEPS = "1" + +do_compile() { + : +} + +do_install() { + install -d ${D}${sysconfdir} + install -D -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab + tmp="${SERIAL_CONSOLES}" + for i in $tmp + do + j=`echo ${i} | sed s/\;/\ /g` + id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'` + echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab + done +} + +# SERIAL_CONSOLES is generally defined by the MACHINE .conf. +# Set PACKAGE_ARCH appropriately. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES_${PN} = "${sysconfdir}/inittab" +CONFFILES_${PN} = "${sysconfdir}/inittab" diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 157aea3..ac6d7ca 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -48,6 +48,8 @@ CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" +RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" + inherit cml1 systemd update-rc.d ptest # internal helper @@ -310,16 +312,6 @@ do_install () { install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK install -D -m 0755 ${WORKDIR}/runlevel ${D}${base_sbindir}/runlevel - if grep "CONFIG_FEATURE_USE_INITTAB=y" ${B}/.config; then - install -D -m 0777 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab - tmp="${SERIAL_CONSOLES}" - for i in $tmp - do - j=`echo ${i} | sed s/\;/\ /g` - id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'` - echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab - done - fi fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then From patchwork Sat Mar 3 01:46:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 130585 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp211544lja; Fri, 2 Mar 2018 17:47:07 -0800 (PST) X-Google-Smtp-Source: AG47ELsZe9itPB/GTBWtLozqMb70gsxkCPwHeWqRbmbwN0Qrffh9tiRm0PKK/AZ1LE3/SlLsncPn X-Received: by 10.98.131.4 with SMTP id h4mr7458765pfe.156.1520041627210; Fri, 02 Mar 2018 17:47:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520041627; cv=none; d=google.com; s=arc-20160816; b=rtVrKhFsA5Rkoaak3imUu2H7qTONwMSFcmJPs9xZphPDUH92c78UQKUnMhhZ5vLWOv 4NchYmgBJOAlqdSYKi0zdbiSdhx9xro6bBsSvD7HjCdx7vWpKxA6xvWSKnke9y0Zj4nf CNZI+Y2iZ7mL2gG5hnsn3i7XV6RMmLJaAWRa3RQayPj8M7FcpOavOm0GbDq1/SQtOetM 74i/zkAtKC1M5/K/vnes6rNn2d0og6+2jVHJGtzRO/SYqxkaMR82hFJFhqkeBsN0jhlX J8npiINXA8VEJvwqndbbwznxnzC/fzyjkJwe300ANgM7YpdvP9d8Acthoph3lYt9s5TI oomA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=8TXf2eFDgq3Z9mW4UENkNAeQXB2s5G+g4oVAHDDPm8k=; b=IsHi4nRlFAozxhNnxWzLjIZXE9BdIzZhuyCs3BGshWrQHOo9TNS7nEtfRe5O5Z4yj2 VuZFkoNv9WDVV/VUImIieOIlGk7wZnLSvZYItJq5O4RNnv1sMph6G7vQ3QRTed0GoQ2w Vc6/pstAvtKrGHCkyGANtnWrd8TTmQuVSCA1GgLtyov8bN6A5X3d2+C+wVDggcfY7SE9 adG1d8UcyzH+H94nzakVT3WgdcyvasHzxpFQTlAhqfrTA4AwDqGXBcUzhArtWmN6o2VO ecSJo79w5t0mdHTtwH+F017vsxVgj5z3IwiiBZ/E3IJdndeM6f95MBdSD7Fr4E5+L+Ho ll5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k1-v6si5890081pli.616.2018.03.02.17.47.05; Fri, 02 Mar 2018 17:47:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 11898789C0; Sat, 3 Mar 2018 01:47:02 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by mail.openembedded.org (Postfix) with ESMTP id 5A9BB789C8 for ; Sat, 3 Mar 2018 01:46:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 381EC20B6F; Sat, 3 Mar 2018 01:47:01 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iwWJQKWv0mMp; Sat, 3 Mar 2018 01:47:01 +0000 (UTC) Received: from mail.denix.org (pool-100-15-85-143.washdc.fios.verizon.net [100.15.85.143]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 0B0D520862; Sat, 3 Mar 2018 01:46:59 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id 59BFC1632F1; Fri, 2 Mar 2018 20:46:59 -0500 (EST) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Fri, 2 Mar 2018 20:46:51 -0500 Message-Id: <1520041611-39622-2-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520041611-39622-1-git-send-email-denis@denix.org> References: <1520041611-39622-1-git-send-email-denis@denix.org> Cc: Denys Dmytriyenko Subject: [OE-core] [PATCH 2/2] layer.conf: add busybox-inittab to SIGGEN_EXCLUDERECIPES_ABISAFE X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Denys Dmytriyenko Similar to sysvinit-inittab Signed-off-by: Denys Dmytriyenko --- meta/conf/layer.conf | 1 + 1 file changed, 1 insertion(+) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index df67716..91935e4 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -21,6 +21,7 @@ COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}' # opkg-utils is for update-alternatives :( SIGGEN_EXCLUDERECIPES_ABISAFE += " \ sysvinit-inittab \ + busybox-inittab \ shadow-securetty \ opkg-arch-config \ netbase \