Message ID | 20210307193148.1513733-2-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=BuGOH5Z8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dts7D0pn9z9sWQ for <incoming@patchwork.ozlabs.org>; Mon, 8 Mar 2021 06:32:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 29DEE827BC; Sun, 7 Mar 2021 20:32:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="BuGOH5Z8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 25087826B2; Sun, 7 Mar 2021 20:31:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6B852826B2 for <u-boot@lists.denx.de>; Sun, 7 Mar 2021 20:31:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oi1-x234.google.com with SMTP id x135so4266696oia.9 for <u-boot@lists.denx.de>; Sun, 07 Mar 2021 11:31:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sHeOZGsxnTOO/mHJkymzAFrFlpgBHutF0WMp8MMmhtc=; b=BuGOH5Z8Gz9cILVdyyqSTQotNR8jbtnqieiQO5C0fB/HH6ZAGxqYAv4a0SKjB1jsxf Pw+GzK2H4/bM6Zyos8BCj8S39wU3lX7npuM50JsDFz6/kL4J9qn+ozO0TEZzbqqrp/7t yLFB3OSJakt63BhWMfir6L0ahmsP9g1Svp9UE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sHeOZGsxnTOO/mHJkymzAFrFlpgBHutF0WMp8MMmhtc=; b=bqqt56qQw7PF3ZjyWjIxgyYasyWZxOvNMofw8pmvunb9anmio9vDnqr6X4itUXCQkC h+rXC/qw79KK9Trrhkdrry73LtK273N9dh+B4bvz/aqXmIgL3QZ2A1oCUqElHpkLwf08 q7yGYhTDUuzG4hlnzXxmH0Bfhrh8zOBM8N9grfAC2bQSxv36/Quy93IZ2w5bfCr6gkUu uEMZlkHhMS6YTwV5GsPc07MbXu7OJvokn1Uhma9nwgI/DOtw1tsEWOncg9wit9Mpwkff ufq73rbxefbpKSWfuU9jpWG5M8LxzhpguiRg0bdwK9c96q9RXRkDzZJr2bF00c62UunE v4Rw== X-Gm-Message-State: AOAM532UnYpZffaqCnUlzl1hEGFLbCo9586prn5nQV24CxAC27iiHsDi QToW7Q84EUNUNztvVG2X/GWXxO2+MbCpjScm X-Google-Smtp-Source: ABdhPJwnIkDGp8mvoNW+R1d5l42SCzf7QN9QOCOBL3OQ+NPqVTBL49v0KnEPMzbHUL1UL8VzQ492LQ== X-Received: by 2002:aca:b646:: with SMTP id g67mr14694581oif.130.1615145513887; Sun, 07 Mar 2021 11:31:53 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id z8sm891074otp.14.2021.03.07.11.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 11:31:53 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Simon Glass <sjg@chromium.org> Subject: [PATCH 01/20] binman: Allow extracting to current directory Date: Sun, 7 Mar 2021 12:31:28 -0700 Message-Id: <20210307193148.1513733-2-sjg@chromium.org> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210307193148.1513733-1-sjg@chromium.org> References: <20210307193148.1513733-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
binman: Support devicetree update in all entries
|
expand
|
diff --git a/tools/binman/control.py b/tools/binman/control.py index 1952b2abf48..9c0cafeafc4 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -241,7 +241,7 @@ def ExtractEntries(image_fname, output_fname, outdir, entry_paths, # If this entry has children, create a directory for it and put its # data in a file called 'root' in that directory if entry.GetEntries(): - if not os.path.exists(fname): + if fname and not os.path.exists(fname): os.makedirs(fname) fname = os.path.join(fname, 'root') tout.Notice("Write entry '%s' size %x to '%s'" %
Extracting files to the current directory is not normally a very friendly thing to do, but it can be warranted, e.g. in a new temporary dir. At present binman reports an error when such an attempt is made. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org> --- tools/binman/control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)