From patchwork Wed Oct 21 23:39:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1385831 X-Patchwork-Delegate: jow@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aparcar.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=mKI+vH+M; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGn7y2svzz9sSn for ; Thu, 22 Oct 2020 10:41:34 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=6AB7kl0hEVGUhmw5udq5Zj0atkyxJmwe/Fz5ytV80dM=; b=mKI+vH+MbWVPVmtUfb1OKDoquk BcuM4ZbbVedLLCP4ImqQLUyvhainvxN9x36Y7m2OAZjnlK3yBpCtB0QqKNV7HVE86EqDyDywFyu1N 0eERvngkQG763AywBHUYQ6AzuYprTEYz6ytCZPMEChqwnTtor20w0nUqDpQEobvjUeY1Hz31qlFnt vRXluA9/1tLUvrHR3Wbw4UP2h9dFA2JQhqrNbVUjsrq1r+UpuwXOxnj5n94K+U3uN1w1EG8a+w7fO OZPrAa9nHODXb26dQxRTmS9/VtuCTZg93KaZrURp1dn2ncslHW8gZqeiPNKsHklkCUqXL8orbOKjg DeJqUSdQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVNi3-0001rO-Qz; Wed, 21 Oct 2020 23:39:59 +0000 Received: from relay3-d.mail.gandi.net ([217.70.183.195]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVNi1-0001qq-E5 for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 23:39:58 +0000 X-Originating-IP: 72.234.141.215 Received: from dawn.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPA id C8E7860002; Wed, 21 Oct 2020 23:39:51 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH buildbot] phase1: don't add kmod feed via buildbot Date: Wed, 21 Oct 2020 13:39:46 -1000 Message-Id: <20201021233946.3723717-1-mail@aparcar.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_193957_564874_A909CD1B X-CRM114-Status: UNSURE ( 8.36 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.195 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jo@mein.io, Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The kmod feed links to a kernel specific archive of compatible kmods. This allows snapshot devices install kmods even after the upstream kernel version changed. As the kmod feed is usable for both firmware and ImageBuilders, the feed should be added via openwrt.git/include/feeds.mk instead of *hacked* into the images by the buildbot. Signed-off-by: Paul Spooren --- Patch for openwrt.git is here: https://github.com/openwrt/openwrt/pull/3425/commits/9343e7d65494b6b9fd7bf0d76b0d5371f7e6dbd2 phase1/master.cfg | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 3ba7a16..0b3e3eb 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -1003,33 +1003,6 @@ for target in targets: haltOnFailure = True )) - if enable_kmod_archive: - # embed kmod repository. Must happen before 'images' - - # find rootfs staging directory - factory.addStep(SetPropertyFromCommand( - name = "stageroot", - property = "stageroot", - description = "Finding the rootfs staging directory", - command=["make", "--no-print-directory", "val.STAGING_DIR_ROOT"], - env = { 'TOPDIR': Interpolate("%(kw:cwd)s/build", cwd=GetCwd) } - )) - - factory.addStep(ShellCommand( - name = "filesdir", - description = "Creating file overlay directory", - command=["mkdir", "-p", "files/etc/opkg"], - haltOnFailure = True - )) - - factory.addStep(ShellCommand( - name = "kmodconfig", - description = "Embedding kmod repository configuration", - command=Interpolate("sed -e 's#^\\(src/gz .*\\)_core \\(.*\\)/packages$#&\\n\\1_kmods \\2/kmods/%(prop:kernelversion)s#' " + - "%(prop:stageroot)s/etc/opkg/distfeeds.conf > files/etc/opkg/distfeeds.conf"), - haltOnFailure = True - )) - #factory.addStep(IfBuiltinShellCommand( factory.addStep(ShellCommand( name = "images",