From nobody Wed Jul 28 20:02:30 2021 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A14DC12AFD33 for ; Wed, 28 Jul 2021 20:02:59 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GZl2W46B6z3L2Z for ; Wed, 28 Jul 2021 20:02:59 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f182.google.com with SMTP id j18so547035ile.8 for ; Wed, 28 Jul 2021 13:02:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SYEq4S8yGICityUwLWT8uPjDDo3R+aZgi0UWyp/a95k=; b=t1uMHktdfHIxkW5oY0CHeH3H43J0ix0qOjK9M9vcGtZJSmSoznumw41/O1Mjw8WqfT OdIrbHm755Ro82F442nwJPzne9xI/ZbhiR+ar3KfFCMpiNxL+RvQjecc4kPEAmjBR05i Ajs++uBH6PkrMUxKEmUW5+Z5+IWaw6bkfb/P1/ItEOs2Zhfheg0zGNr33L9ycHt/N5Fd JEt7ilVJr/DfBW4CkjD3xcJLK+ZqxNjQTqijmKqdm4DU4YrrXF9UFkTYxmsYRWYc1ovP ZGtZGLJjXNX2JZjBqsI3crKC8SgTVEdDoUOz7q81XdZmiLB3eMhkQZG8jQ3EKKlS9YsQ aDpg== X-Gm-Message-State: AOAM532vAqOpuB6coAuFz5yoGVxzQTGvJBRDqd10+cCpSteUyvqyO5ts h0cW5vPvosu4U/gTvKpsADzOtcq/c+sczB/Knkc9ebABSzw= X-Google-Smtp-Source: ABdhPJwIT9lVwbJsVodbz3uW3U++Rp2+NNv/ls4SEhjen3WJYteLgdKi2Jee9Z6B5VcNt2A4GjFZn9CUqfYhs5IGn3I= X-Received: by 2002:a05:6e02:50c:: with SMTP id d12mr1016404ils.256.1627502572930; Wed, 28 Jul 2021 13:02:52 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: <8e1a8e3c-b062-7749-ceab-e500c1ab758e@protected-networks.net> <04456969-bee0-8b22-4e81-a3201824d852@protected-networks.net> In-Reply-To: <04456969-bee0-8b22-4e81-a3201824d852@protected-networks.net> From: Ed Maste Date: Wed, 28 Jul 2021 16:02:30 -0400 Message-ID: Subject: Re: awk behaviour? To: Iain Michael Butler Cc: Warner Losh , freebsd-current Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4GZl2W46B6z3L2Z X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Wed, 28 Jul 2021 at 15:15, Michael Butler via freebsd-current wrote: > > What prompted the question was my (obviously poor) attempt to debug and > resolve this failure when attempting to build a release for i386 on an > amd64 .. This will be due to my 4e224e4be7c3. I'm not sure exactly what's happening yet, but I can provoke this behaviour if `${PKG_CMD} --version` outputs something other than a single line with the version number. Can you give this change a try: diff --git a/Makefile.inc1 b/Makefile.inc1 index 23fb4b5581ac..9ef954e0678c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1860,7 +1860,7 @@ _pkgbootstrap: .PHONY .if make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages) PKG_ABI!=${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI .endif -PKG_BIN_VERSION!=${PKG_CMD} --version | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3}' +PKG_BIN_VERSION!=${PKG_CMD} --version | awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}' .if ${PKG_BIN_VERSION} < 11700 PKG_EXT= ${PKG_FORMAT} .else