From owner-freebsd-reproducibility@freebsd.org Wed Apr 1 19:21:08 2020 Return-Path: Delivered-To: freebsd-reproducibility@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 102D327E7B8 for ; Wed, 1 Apr 2020 19:21:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 48swys5D55z3HX7 for ; Wed, 1 Apr 2020 19:20:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io1-xd2e.google.com with SMTP id h131so984511iof.1 for ; Wed, 01 Apr 2020 12:20:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=cJR/XvGYTmUoXWj9yrZzVRhalHgH4uTxaiJRbgDgQUU=; b=i6vHmnGeXdiZeGO53+Q0YK9USzRNhJomUiMV7EdUpYIJGCN31wePwifH3oFGW2ilQF uZ6Ai3qUfYWjgOCFWeMnt4DHqTf4qyQ/zlzkksvVIG/p/0b28o4S6Urk/hgM/3+kRZzd X08CicmziJbEw7bx5mJcijrlwXXJHdh5LZ0PMvk0YuWyoNGrflzJntE9k1TvHFQCe9EG 1kX+gWCUPJhAMVV2bJ39PKYQvClS05yYpdFNj9LyfXSfYSjyqnH3voxhXJAMpPMc1m2p /wqb9tZcICm5TgM421DN7sdAxwTcY/Q4V7Y/vxEJW1rbWibaK3aNV71HFrqGE/cBmzUC tihA== 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=cJR/XvGYTmUoXWj9yrZzVRhalHgH4uTxaiJRbgDgQUU=; b=W86ZoE9WLz8A95EoU3AoncWy9QDHx7Pm4YlrA2ZQdQKAnpfqgXV26fhZiGScwRpGPQ ti/SJ6e6MgoCcoX9t97ypAP/ijGp28frSQpw8vQgj9ayN9FMhbqahWQ0+JsmdTsdFgIH BFH3iz1b+jiovQqYqmLRfpNmoPkotURfynAv2itvz5tx4P6+vY/21683OvVJfJXaRvSD Aj/qtDXYrcro3EVXYSrEz8P53KjJvUCvtC94327T1fem4v/L7aVc3lgRB07UlbUUZzIF /qJGIk7huf7wSpO9sd6/QBZQIEmDG9OeIm9yc80OOLCU+Qc6/GjmoOJ0L1TxcSoHwZR+ QWGg== X-Gm-Message-State: ANhLgQ1va0KKEnGqYOZ2gmpOsMdy8LYjz0/PrTq2MX+p1nqTVpII8/qU OyBmuoRppGzDlOln4sY+SGmMqiSK/W1f5MehVc5tbVa2 X-Google-Smtp-Source: ADFU+vvVnt4luisEKXITjnARwa4Yg+Pgqqvebhq5YtstXD1zKPcqlbiflrF9KmtKgYEWut+5pBevcy+CBbsNttrXvXg= X-Received: by 2002:a05:620a:200b:: with SMTP id c11mr11532104qka.380.1585768540882; Wed, 01 Apr 2020 12:15:40 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 1 Apr 2020 13:15:30 -0600 Message-ID: Subject: Re: Nonreproducible kernel modules on stable/12 To: Ed Maste Cc: freebsd-reproducibility@freebsd.org X-Rspamd-Queue-Id: 48swys5D55z3HX7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=i6vHmnGe; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::d2e) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.39 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-reproducibility@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; URI_COUNT_ODD(1.00)[1]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[e.2.d.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-1.39)[ip: (-6.12), ipnet: 2607:f8b0::/32(-0.35), asn: 15169(-0.45), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Mailman-Approved-At: Thu, 02 Apr 2020 07:57:22 +0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: freebsd-reproducibility@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions regarding FreeBSD reproducible builds List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2020 19:21:08 -0000 On Wed, Apr 1, 2020 at 1:10 PM Warner Losh wrote: > Sigh > > freebsd-update-build is being naughty: > > sed -i "" -E "s,^(BRANCH=3D.*)\",\1$2\"," > > and editing newvers.sh directly. > > This doesn't work. > > However, the change was > > BRANCH=3D"STABLE" > to > BRANCH=3D${BRANCH_OVERRIDE:-STABLE} > > maybe a quick hack is to add back the quotes or to change the above sed t= o > > sed -i "" -E "s,^(BRANCH=3D.*),\1\"$2\"," > > which would work on all branches because the expression > > BRANCH=3D"STABLE""-p2" > > is well formed as is > > BRANCH=3D${BRANCH_OVERRIDE:-STABLE}"-p2" > Or it could just set BRANCH_OVERRIDE to what it wants and not the crazy FUTUREBRANCH thing... Warner > Warner > > On Tue, Mar 31, 2020 at 8:08 AM Ed Maste wrote: > >> Originally reported off-list, during a stable/12 freebsd-update build >> kernel modules are not reproducible and thus get included in the >> update. >> >> diffoscope reports that the .SUNW_ctf section is responsible: >> >> --- cam.0.ko >> +++ cam.1.ko >> =E2=94=9C=E2=94=80=E2=94=80 readelf --wide --sections {} >> ... >> =E2=94=82 [30] .shstrtab STRTAB 0000000000000000 0ea= 828 >> 0001f8 00 0 0 1 >> =E2=94=82 - [31] .SUNW_ctf PROGBITS 0000000000000000 0f2= 9d8 >> 00e2ad 00 32 0 4 >> =E2=94=82 + [31] .SUNW_ctf PROGBITS 0000000000000000 0f2= 9d8 >> 00e2b1 00 32 0 4 >> =E2=94=82 [32] .symtab SYMTAB 0000000000000000 0e1= 2b8 >> 009570 18 33 1001 8 >> ... >> =E2=94=9C=E2=94=80=E2=94=80 readelf --wide --decompress --hex-dump=3D.SU= NW_ctf {} >> =E2=94=82 @@ -1,3630 +1,3631 @@ >> =E2=94=82 >> =E2=94=82 Hex dump of section '.SUNW_ctf': >> =E2=94=82 0x00000000 f1cf0201 00000000 00000000 00000000 ............= .... >> =E2=94=82 0x00000010 08000000 96040000 fc250000 f4310100 .........%..= .1.. >> =E2=94=82 - 0x00000020 6aeb0000 78dabc7d 077c54c5 16f7ccbd j...x..}.|T.= .... >> =E2=94=82 - 0x00000030 774b42ca 26b48524 b0402001 02440d10 wKB.&..$.@ .= .D.. >> ... >> =E2=94=82 + 0x00000020 6feb0000 78dabc7d 077c54c5 16f7ccdc o...x..}.|T.= .... >> =E2=94=82 + 0x00000030 bb252165 13da4242 586a0204 081820d4 .%!e..BBXj..= .. . >> >> (And build-ID and GNU debuglink differ as a result.) >> >> Running ctfdump and comparing the result shows the issue: >> >> --- a 2020-03-31 10:04:39.766567000 -0400 >> +++ b 2020-03-31 10:04:44.663292000 -0400 >> @@ -11,11 +11,11 @@ >> cth_funcoff =3D 1174 >> cth_typeoff =3D 9724 >> cth_stroff =3D 78324 >> - cth_strlen =3D 60266 >> + cth_strlen =3D 60271 >> >> - Label Table >> ---------------------------------------------------------------- >> >> - 2407 FreeBSD 12.1-STABLE amd64 1201512 >> + 2407 FreeBSD 12.1-FUTUREBUILD amd64 1201512 >> >> - Data Objects >> --------------------------------------------------------------- >> >> Aside, we should add ctfdump to diffoscope. >> >