From patchwork Tue Jan 23 13:55:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 864793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4010:c07::23d; helo=mail-lf0-x23d.google.com; envelope-from=swupdate+bncbdn7dbh5yqibbax6ttjqkgqelqzhmga@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="IOo0Gkw5"; dkim-atps=neutral Received: from mail-lf0-x23d.google.com (mail-lf0-x23d.google.com [IPv6:2a00:1450:4010:c07::23d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zQqbC0qVBz9s1h for ; Wed, 24 Jan 2018 00:56:22 +1100 (AEDT) Received: by mail-lf0-x23d.google.com with SMTP id h8sf145991lfe.18 for ; Tue, 23 Jan 2018 05:56:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1516715779; cv=pass; d=google.com; s=arc-20160816; b=sFHpfJ429J54TE75fH/cFmKM4TWPLxXTnl07Wbf3uOVc8+j5VFh0K9fhIU7pQqU4IR WZ1gGp4atvotBEWa54tIGVWArAkuXAbKNd7dz5GkYZUkrKMgTBs25b9+rBXTubuOdeV3 WlkxoEODa9MDyHjtp6TarnmRv3tP2nCSus0iYRgKb5/TgYpR43n72ebdDwAfid9JWiju 7LLepHs+mVZ1JXe/rl5EorTSdtgd5oeENWbHc6sXrO48lqaKeylFprdEHQzatdHq3s/A oBUrxJVTgjg415h/vVSEZx3IuMFIOxrJkPTDvYo76Tmum7fhhvSw8gTrzGWkRS8hQiy3 XxIQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=JhSlP+XA94evop/Uar2uuNbFFH2gWXjp0NTgHz+R3fQ=; b=JKiLReme+JhmqAL9nB53yIjpVqRrCHGSKiXCrguSl0bG1HN3RW6IJu9VSijM8OCEmt ccfanhqMDx9GNFVsoOFQOLPNG8n5Z4ebB5JTHYHDYrQkZJPkmp3hp0zqtNx9pjycM+6H 5rSUehya4KcKufyCVzWqWd1Ms7S2KkAhz+nM+McDf9py0dVNBsbcWc77DlJUX2PfgswS c2QV5i6rp5qK5RNviyw7XJYDT401g7dTEGvtBzUCMS8+tRMxerJUVPW/Gr+fRXdrwg7+ m2HIO3kmdkEM++0lwoo1/UfujsDRYvRXkXTsOA0h/K9RZDP1mTHN3ZZOYpjqIhr2LY6d OB6w== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 85.13.157.12 is neither permitted nor denied by best guess record for domain of stefan@herbrechtsmeier.net) smtp.mailfrom=stefan@herbrechtsmeier.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=JhSlP+XA94evop/Uar2uuNbFFH2gWXjp0NTgHz+R3fQ=; b=IOo0Gkw5E7Qnz+SxJ9T39nDJf9RYo8t5/h0pB+l/k2NbV7q3Gj+OuysA1/6UBsVGrd zUOZAeT7sw2rDuxaZ9YmLZimS3px0LWnUXXiTxRRSQpDIekKlAKipV8pcHFLI9iO8j0c 1rPVCBMuLrtjRSzL7eYwJIcvO3Mw6nt4ENJa/596A9MrUffyWK7TkkDYGYQkbOecqdao nc9pLuAZ4aqZpVIjYzoP8A7Wcv9ATNJH6rQ6a4tHcH068+7Vj+ND7j1gHdFjem61FxOi psrFrrXqXUtFvkz7IA7ry2oTkND4m9/OLD/WOC4FOtCpeHLmWTbLt+moXE4eYrBVlz8/ Hhuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=JhSlP+XA94evop/Uar2uuNbFFH2gWXjp0NTgHz+R3fQ=; b=CSvijpqBw22yWZ+gDzzQi8jMLJau8i2AgbYX6MVY3/LzkMzzhbg1BMEmzvnbuZ1EjF 0VKGkmWu5BUSgfyYX7pIq0sOg1qP6E5AwVAecNwEIJR9Yl5IOCPWnx52Wx500xWxtNl+ lbnx8lZqPJs35d7L2Tnmwrvd5atbJUDjUrq+aaevSEB5z6dThG0wxrni1ZYvWx+vam+8 owpKu87cPtLc/H6fYLVWxHsutIx2Eb8Dvgaq/Em0LlMC9WfalmWYKmyanyPxrH6kNSmf r0BChaSOXKnfFaBM/81Nkd1db+JLXqBlobTSedQQwFzmtiZtvIO3mKsiaQriEcZCTF/r 8dfQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AKwxytdMvi43xmpOqQsD2/0bfNYhk6HFt/oNAYNlYWI998AeQo2Oz/LM WTvlwFxMuAa6X3et4x/QKaA= X-Google-Smtp-Source: AH8x225WdOMBTJf03E+VQVe78LczXuG8aLNqIWSi1pzXyeR/5evLxr+eCUDFzqUqlVAkjTbgnnQ42Q== X-Received: by 10.46.77.89 with SMTP id a86mr7656ljb.4.1516715779098; Tue, 23 Jan 2018 05:56:19 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.46.22.21 with SMTP id w21ls899891ljd.12.gmail; Tue, 23 Jan 2018 05:56:18 -0800 (PST) X-Received: by 10.46.0.163 with SMTP id e35mr190915lji.31.1516715778280; Tue, 23 Jan 2018 05:56:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516715778; cv=none; d=google.com; s=arc-20160816; b=vSD87gro7oaWRg1kZxZeZrUJzKjAbxB/91+nYgIStQlpfPumfd/AGxGhnbiBvA5BBg GlDNda2UkxVxKLLzYM4q0RNvj4dzjDmt1W/LOmWti9Rz3zb1HTrrcKrQp57A0qgo4eoE OeCAGaTVfN0UcVU304vm1AvcU3HxsCUKS7WXfBntdDCxSc0quDLgf/cLIL9TMy+s46KW yYZQsByhCShc4/p2gAlk1YQkGt4eLe7EH1qQRTR3riH6TTn0HiPTeESB9jvDrGJR8zS7 M/GCQ14DmQPUL/JFiEKXFeTqsCzawW8I0+Gx4qxIpBZQJv2eRKzqDdt6K78ISj6qPyAk BN/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=b7LxkD5U2aBFDKTswHeTsi0fGeAA8tsL6myTSlOX05o=; b=NMtr2DyZ88Q0e4HRvCy3lGh0RlW8W6dfZ8gUrd3caM4CajD2QYwLuZW/y+MEI4Nuan CPh9AXjBlRUqvpsYX2gWHQJQyEQTXK88Y1TIDr/a3oa+v9xNWhjtSHfvL/dTBKWqKUxp rAPRPqFAK/OEq33m9iRnn9OKp+WsxvA5DS+xODePb4uvyr6kdwSuw1ThgoGJWEaiRNsv MvEnDupQGeMRnIx0wIvF+tm+EeJ5NKQaiXOf41bMAFHel82uhLOT38yKeR7/gO3c7WIv /VFO+yTJQLpZFZoDHTqZo6RKSttaS3Luau9AGPutglyosdOWZL8GJXWkz8tgYOedrSEs KEsw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 85.13.157.12 is neither permitted nor denied by best guess record for domain of stefan@herbrechtsmeier.net) smtp.mailfrom=stefan@herbrechtsmeier.net Received: from dd41138.kasserver.com (dd41138.kasserver.com. [85.13.157.12]) by gmr-mx.google.com with ESMTPS id l26si2200767lja.0.2018.01.23.05.56.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 05:56:18 -0800 (PST) Received-SPF: neutral (google.com: 85.13.157.12 is neither permitted nor denied by best guess record for domain of stefan@herbrechtsmeier.net) client-ip=85.13.157.12; Received: from WS08941.weidmueller.com (unknown [217.244.7.16]) by dd41138.kasserver.com (Postfix) with ESMTPSA id 52D3411A05ED; Tue, 23 Jan 2018 14:56:17 +0100 (CET) From: stefan@herbrechtsmeier.net To: swupdate@googlegroups.com Cc: Stefan Herbrechtsmeier Subject: [swupdate] [PATCH 3/5] parser: Add support for Lua hook script to script artifacts Date: Tue, 23 Jan 2018 14:55:59 +0100 Message-Id: <1516715761-3043-3-git-send-email-stefan@herbrechtsmeier.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516715761-3043-1-git-send-email-stefan@herbrechtsmeier.net> References: <1516715761-3043-1-git-send-email-stefan@herbrechtsmeier.net> X-Original-Sender: stefan@herbrechtsmeier.net X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 85.13.157.12 is neither permitted nor denied by best guess record for domain of stefan@herbrechtsmeier.net) smtp.mailfrom=stefan@herbrechtsmeier.net Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier Acked-by: Stefano Babic --- parser/parser.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/parser/parser.c b/parser/parser.c index e07ed8e..6add999 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -330,7 +330,7 @@ static int parse_partitions(parsertype p, void *cfg, struct swupdate_cfg *swcfg) return 0; } -static int parse_scripts(parsertype p, void *cfg, struct swupdate_cfg *swcfg) +static int parse_scripts(parsertype p, void *cfg, struct swupdate_cfg *swcfg, lua_State *L) { void *setting, *elem; int count, i; @@ -377,6 +377,13 @@ static int parse_scripts(parsertype p, void *cfg, struct swupdate_cfg *swcfg) } script->is_script = 1; + add_properties(p, elem, script); + + if (run_embscript(p, elem, script, L, swcfg->embscript)) { + free_image(script); + return -1; + } + LIST_INSERT_HEAD(&swcfg->scripts, script, next); TRACE("Found Script: %s\n", @@ -619,7 +626,7 @@ static int parser(parsertype p, void *cfg, struct swupdate_cfg *swcfg) ret = parse_hw_compatibility(p, cfg, swcfg) || parse_files(p, cfg, swcfg, L) || parse_images(p, cfg, swcfg, L) || - parse_scripts(p, cfg, swcfg) || + parse_scripts(p, cfg, swcfg, L) || parse_bootloader(p, cfg, swcfg); /*