From owner-freebsd-stable@freebsd.org Mon Jan 4 03:57:44 2021 Return-Path: Delivered-To: freebsd-stable@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 490824CA034 for ; Mon, 4 Jan 2021 03:57:44 +0000 (UTC) (envelope-from dewayne@heuristicsystems.com.au) Received: from hermes.heuristicsystems.com.au (hermes.heuristicsystems.com.au [203.41.22.115]) (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 client-signature RSA-PSS (2560 bits) client-digest SHA256) (Client CN "hermes.heuristicsystems.com.au", Issuer "Heuristic Systems Type 4 Host CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8MKK6l40z3jhD for ; Mon, 4 Jan 2021 03:57:41 +0000 (UTC) (envelope-from dewayne@heuristicsystems.com.au) Received: from [10.0.5.3] (noddy.hs [10.0.5.3]) (authenticated bits=0) by hermes.heuristicsystems.com.au (8.15.2/8.15.2) with ESMTPSA id 1043uvXA044117 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Mon, 4 Jan 2021 14:56:58 +1100 (AEDT) (envelope-from dewayne@heuristicsystems.com.au) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=heuristicsystems.com.au; s=hsa; t=1609732618; x=1610337419; bh=RRSGZQ/LaNjayeLMasXqZw5OM72Z56hFwlWJRMCMnFc=; h=From:To:Subject:Message-ID:Date; b=P5crkTspGWuzNBAwYSGUJGCSoZy1SIyJ8YSQ5gfSaxO7LPF6kxrlSdVGnK5lyKzVf h/FjQa9Lkwnj2sbcwBoFD+B9KYTATJanz6E5aqNhkweaSrFtXxPa1ijf6lZF/mjAkV HrZwca5XjlyEuQDAQ54ZubgnJb6Q0SHgtUBN+IgNbRF0hWcB9nZJi X-Authentication-Warning: b3.hs: Host noddy.hs [10.0.5.3] claimed to be [10.0.5.3] From: Dewayne Geraghty To: FreeBSD Stable Mailing List Subject: Is git/svn in sync with FreeBSD12.2Stable Message-ID: Date: Mon, 4 Jan 2021 14:56:46 +1100 User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D8MKK6l40z3jhD X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=heuristicsystems.com.au header.s=hsa header.b=P5crkTsp; dmarc=none; spf=pass (mx1.freebsd.org: domain of dewayne@heuristicsystems.com.au designates 203.41.22.115 as permitted sender) smtp.mailfrom=dewayne@heuristicsystems.com.au X-Spamd-Result: default: False [-4.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; HAS_XAW(0.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[203.41.22.115:from]; DKIM_TRACE(0.00)[heuristicsystems.com.au:+]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:1221, ipnet:203.40.0.0/13, country:AU]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[heuristicsystems.com.au:s=hsa]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[heuristicsystems.com.au:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[heuristicsystems.com.au]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_SPAM_SHORT(1.00)[1.000]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 03:57:44 -0000 I'm using https://cgit.freebsd.org/src/log/?h=stable%2F12 to monitor changes to FreeBSD 12.2Stable, as I used to use https://lists.freebsd.org/pipermail/svn-src-stable-12/2020-December/ The git site has substantially more changes than # svnlite update /usr/src Updating '/usr/src': U /usr/src/tests/sys/sys/bitstring_test.c U /usr/src/sys/dev/superio/superio.c U /usr/src/sys/dev/ice/ice_common.h U /usr/src/sys/dev/qat/qat_ae.c U /usr/src/sys/dev/ntb/ntb_hw/ntb_hw_intel.c U /usr/src/sys/amd64/amd64/support.S U /usr/src/sys/i386/i386/support.s U /usr/src/sys/modules/em/Makefile U /usr/src/sys/netinet/sctp_input.c U /usr/src/sys/conf/kern.mk U /usr/src/sys/vm/uma_core.c U /usr/src/libexec/rtld-elf/i386/reloc.c U /usr/src/libexec/tftpd/tftp-io.c U /usr/src/libexec/tftpd/tftp-transfer.c U /usr/src/lib/msun/Makefile U /usr/src/sbin/hastd/hastd.c U /usr/src/share/mk/bsd.sys.mk U /usr/src/usr.bin/locate/locate/locate.1 U /usr/src The above updated /usr/src from: Last Changed Author: rew Last Changed Rev: 368733 Last Changed Date: 2020-12-18 06:49:17 +1100 (Fri, 18 Dec 2020) Am I misreading the git log or is sync'ing not occurring? From owner-freebsd-stable@freebsd.org Mon Jan 4 04:22:10 2021 Return-Path: Delivered-To: freebsd-stable@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 3A6114CA4C0 for ; Mon, 4 Jan 2021 04:22:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (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 4D8MsY1zY9z3kl0 for ; Mon, 4 Jan 2021 04:22:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72b.google.com with SMTP id b64so22459340qkc.12 for ; Sun, 03 Jan 2021 20:22:08 -0800 (PST) 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=bLp4lbUMY4tR+oDOhZQcHw+Nd/M+HPhskEM49D7PhFo=; b=1q++M8b+2kmBQdWCoTTPtyWWUh4d3lB5EHyYoXGaGcf76xsatS3FzI9tK06XEkj42g UCYQqrSC0UO/y5Rqa3EY2zJHMLNiQopFxTnIiTRyMb2APDI0/eISHU4zMSbHtpTu++k3 d7N5ZdtnctUs0tD4k0F0G7DQRY4RfApFeElyB33l9WmGV4IX4rlPqmuAzXdttrJYXZ0x FHLVCHKXQrmq4NMWIGFdCvbDnLEpXCbv/Anev27Lt1S2ScORvb4pjGbpwqlXmKVDSrd7 8VZl2mUQkMQVAY+Y5yq61tu+s0Kl9pfBPGOLcOZ31vDD28Dy3jcpLiOaF2RTZloIDmhS SUUA== 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=bLp4lbUMY4tR+oDOhZQcHw+Nd/M+HPhskEM49D7PhFo=; b=T45DPJcS17MWzmce7xnbg23bXhYE6+8qg5AYwDnx2zCMlp4KLcS3zop77iBwVZAIKR E6XOZTE0vPoIq/SY2LhkTZb1YHTIcFjhh9WgFkI8X+A1wHekn0L/Zh9OTpGNaEj3D2aZ 30dVk1pkYGwwLzwOrQGJOPzZ2RwgrUVSwCPBXAEzf9XHWUekjXSrujnwrykHUaSQtILb geqJHQyLKHiWemVE6eHHbSc8gGaNI/Gav8ACNzvR4VK3asZsi40t3iP3HScfk2VCR8Hh aOQd0HjMNUE3hwQGOMYbWnXh4tHeayglDkV24SUjXqD0Mvjjqp/c/YtILvEWyxKzM5Qi ukGw== X-Gm-Message-State: AOAM533KE25cBrwn7drW5VNt+mXvbwxcxrfmG2qVZNUUQRB48LVHJ3Cx q+mC5UzX/CKDObu32mY/EjZEAiA4ZubgsqfZ3YVSO37UGVoWaA== X-Google-Smtp-Source: ABdhPJyXcCyW0zxoOrtsjQ1sAF/idMJ2yF7Ajm8LfnZqFAhD8d7GowwDnF5RzSbtdrgIt3Y8w0Rubc+47J8agShfkwA= X-Received: by 2002:a37:a614:: with SMTP id p20mr68667585qke.359.1609734128015; Sun, 03 Jan 2021 20:22:08 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sun, 3 Jan 2021 21:21:56 -0700 Message-ID: Subject: Re: Is git/svn in sync with FreeBSD12.2Stable To: Dewayne Geraghty Cc: FreeBSD Stable Mailing List X-Rspamd-Queue-Id: 4D8MsY1zY9z3kl0 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=1q++M8b+; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72b:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72b:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72b:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 04:22:10 -0000 On Sun, Jan 3, 2021, 8:57 PM Dewayne Geraghty < dewayne@heuristicsystems.com.au> wrote: > I'm using > https://cgit.freebsd.org/src/log/?h=stable%2F12 > to monitor changes to FreeBSD 12.2Stable, as I used to use > https://lists.freebsd.org/pipermail/svn-src-stable-12/2020-December/ > > The git site has substantially more changes than > # svnlite update /usr/src > Updating '/usr/src': > U /usr/src/tests/sys/sys/bitstring_test.c > U /usr/src/sys/dev/superio/superio.c > U /usr/src/sys/dev/ice/ice_common.h > U /usr/src/sys/dev/qat/qat_ae.c > U /usr/src/sys/dev/ntb/ntb_hw/ntb_hw_intel.c > U /usr/src/sys/amd64/amd64/support.S > U /usr/src/sys/i386/i386/support.s > U /usr/src/sys/modules/em/Makefile > U /usr/src/sys/netinet/sctp_input.c > U /usr/src/sys/conf/kern.mk > U /usr/src/sys/vm/uma_core.c > U /usr/src/libexec/rtld-elf/i386/reloc.c > U /usr/src/libexec/tftpd/tftp-io.c > U /usr/src/libexec/tftpd/tftp-transfer.c > U /usr/src/lib/msun/Makefile > U /usr/src/sbin/hastd/hastd.c > U /usr/src/share/mk/bsd.sys.mk > U /usr/src/usr.bin/locate/locate/locate.1 > U /usr/src > > The above updated /usr/src from: > Last Changed Author: rew > Last Changed Rev: 368733 > Last Changed Date: 2020-12-18 06:49:17 +1100 (Fri, 18 Dec 2020) > > Am I misreading the git log or is sync'ing not occurring? > The sync has not yet started. Warner _______________________________________________ > freebsd-stable@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" > From owner-freebsd-stable@freebsd.org Mon Jan 4 12:33:25 2021 Return-Path: Delivered-To: freebsd-stable@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 78D624D4966; Mon, 4 Jan 2021 12:33:25 +0000 (UTC) (envelope-from ali.abdallah@suse.com) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp2.suse.de", Issuer "Let's Encrypt Authority X3" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8ZmN5zBKz4fN0; Mon, 4 Jan 2021 12:33:24 +0000 (UTC) (envelope-from ali.abdallah@suse.com) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id AD724AD1E; Mon, 4 Jan 2021 12:33:22 +0000 (UTC) Date: Mon, 4 Jan 2021 13:33:21 +0100 From: Ali Abdallah To: techyNotes Cc: freebsd-fs@freebsd.org, freebsd-stable@freebsd.org Subject: Re: Consistency of pkg db on UFS Message-ID: <20210104123321.nvjambhslmvzmiac@Fryzen495> References: <20201211165713.syvzamtdtrbrgx44@frix230> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D8ZmN5zBKz4fN0 X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.20 / 15.00]; MID_RHS_NOT_FQDN(0.50)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:195.135.220.15]; MIME_GOOD(-0.10)[text/plain]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DWL_DNSWL_MED(-2.00)[suse.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[195.135.220.15:from]; DKIM_TRACE(0.00)[suse.com:+]; DMARC_POLICY_ALLOW(-0.50)[suse.com,quarantine]; RWL_MAILSPIKE_GOOD(0.00)[195.135.220.15:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:29298, ipnet:195.135.220.0/22, country:DE]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-fs,freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 12:33:25 -0000 On 12.12.2020 09:44, techyNotes wrote: > Hi Ali Hi > > I had a similar problem with my HP Elitebook couple of days ago with UFS option. I had been experimenting with various modes and setup options including the file system ZFS and UFS. I would have installed and reinstalled Freebsd 12.2 more than 20 times! > > I guess the issue lies in the Installation process. Just before the final step of rebooting it takes sometime (more than when installing with ZFS option) to complete the installation closure tasks. This was not completed or you did not wait until the point the message popped up to reboot the system! > > To verify if this is the case, check your loader.conf and/or rc.conf it would be empty. The options you selected during the install process would not be recorded in these files. > > SOLUTION: I just reinstalled again with the option of UFS and waited on the last before step patiently and then finally rebooted upon the alter message of REBOOT option from the installer. I'm no speaking about the installer, but an already installed system. I don't believe there is a solution to the described issue, the blocks of a newly installed package can make it to the disk and to the fs metadata, but the information about it written by the package manager to its database/plain file might not make it to the disk in case of power failure/panic, so you would end up with an installed package that the package manager itself doesn't know about! The issue can happen on any filesystem, not only on UFS. Regards, Ali From owner-freebsd-stable@freebsd.org Mon Jan 4 17:00:13 2021 Return-Path: Delivered-To: freebsd-stable@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 E42904DC918 for ; Mon, 4 Jan 2021 17:00:13 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8hhF3bxWz3JgS for ; Mon, 4 Jan 2021 17:00:13 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 104H0BOt088238 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 4 Jan 2021 18:00:12 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Mon, 4 Jan 2021 18:00:11 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Helge Oldach Cc: freebsd-stable@freebsd.org Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: Mail-Followup-To: Helge Oldach , freebsd-stable@freebsd.org References: <202101031802.103I2PhD046011@nuc.oldach.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <202101031802.103I2PhD046011@nuc.oldach.net> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D8hhF3bxWz3JgS X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 17:00:14 -0000 On Sun, 2021-01-03 at 19:02:24 +0100, Helge Oldach wrote: >Hi all, > >I have deep cloned main from https://git.freebsd.org/src.git as >described in the mini primer and started pulling updates. Now I'm >stumbling over a bit of confusion: > >| hmo@p48 /usr/src $ git log -p e35a01eec6926bfb5c088ca8961079b51a067bf3 >| commit e35a01eec6926bfb5c088ca8961079b51a067bf3 >| Merge: 2ff66a91552 96b88ac701b >| Author: Philip Paeps >| Date: Wed Dec 30 12:50:26 2020 +0800 >| >| contrib/tzdata: import tzdata 2020f >| >| Merge commit '96b88ac701b35ce68425046d4be8f51cb75b5d5b' into main >| >| Changes: https://github.com/eggert/tz/blob/2020f/NEWS >| >| MFC after: 1 day >| >| commit 96b88ac701b35ce68425046d4be8f51cb75b5d5b >| Author: Philip Paeps >| Date: Wed Dec 30 12:45:24 2020 +0800 >| >| Import tzdata 2020f >| >| diff --git a/Makefile b/Makefile >| index 5064a190c5a..1136af9298f 100644 >| --- a/Makefile >| +++ b/Makefile >| @@ -945,7 +945,10 @@ check_public: $(VERSION_DEPS) >| mkdir public.dir >| ln $(VERSION_DEPS) public.dir > >What confuses me is that the diff refers to just "Makefile". Same for >the other files in this commit. The diff just looks like the vendor >commit and not like the merged commit. This is kind of confusing as >clearly this commit does not refer to the main source Makefile, but just >to contrib/tzdata/Makefile. Well, you're looking at the diff of the vendor import, not the diff of the merge commit. The vendor area doesn't have a prefix in its tree, see the output of git ls-tree -r 96b88ac701b35ce68425046d4be8f51cb75b5d5b That is the vendor area tree for tzdata. What trips you up is that git log -p does _not_ show diffs for merge commits by default, because with 2 parents for a commit, what's the diff really? Look carefully at the 2nd line, it says "Merge: 2ff66a91552 96b88ac701b" indicating that this is a merge commit. To get a meaningful diff output, you sadly have to hand-hold git. What always works is comparing 2 trees directly, so (add -p to see full diff): % git diff-tree 2ff66a91552 e35a01eec6926bfb5c088ca8961079b51a067bf3 :040000 040000 8feda71c4bc2d2deb3a6c3dcf19ca1272ef51c71 6e6f976db44b4430645b0c6d7a169d5e5564acec M contrib This has to assume that the first parent shown was the previous commit on main, but it could well have been the other way round. But you also list the commit for 96b88ac701b35ce68425046d4be8f51cb75b5d5b so it's clear that this had to be the one. You can short-cut this, assuming that the first parent will always be on main (I think this is true in the conversion). % git diff e35a01eec^1..e35a01eec (^1 means first parent of the commit, and is often equivalent to ~1 which means "go 1 back"). At which point you can read git-log(1) and see that there's also a --first-parent option, which will only walk the first parent and properly works in tandem with -p. hth Uli From owner-freebsd-stable@freebsd.org Tue Jan 5 11:08:57 2021 Return-Path: Delivered-To: freebsd-stable@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 62BE54E0F50 for ; Tue, 5 Jan 2021 11:08:57 +0000 (UTC) (envelope-from petefrench@ingresso.co.uk) Received: from constantine.ingresso.co.uk (constantine.ingresso.co.uk [31.24.6.74]) (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) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D98rS505Kz3ppX for ; Tue, 5 Jan 2021 11:08:56 +0000 (UTC) (envelope-from petefrench@ingresso.co.uk) Received: from [2001:470:6cc4:1:cd6:5836:ddba:7b54] (helo=balta.drayhouse.twisted.org.uk) by constantine.ingresso.co.uk with esmtpsa (TLS1.3) tls TLS_AES_128_GCM_SHA256 (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kwkCm-000Epb-UH for freebsd-stable@freebsd.org; Tue, 05 Jan 2021 11:08:49 +0000 To: FreeBSD Stable Mailing List From: Pete French Subject: How to handle the pack files now we have switched to git? Message-ID: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> Date: Tue, 5 Jan 2021 11:08:48 +0000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D98rS505Kz3ppX X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=ingresso.co.uk; spf=pass (mx1.freebsd.org: domain of petefrench@ingresso.co.uk designates 31.24.6.74 as permitted sender) smtp.mailfrom=petefrench@ingresso.co.uk X-Spamd-Result: default: False [-2.80 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[31.24.6.74:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:31.24.6.74]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[31.24.6.74:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[ingresso.co.uk,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16082, ipnet:31.24.0.0/21, country:GB]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2021 11:08:57 -0000 So, for me the switch to git went very smoothly. I havent moved to etcupdate yet, but will probably do that soon. Hopwever I did hit one issue. What I do is to build on a single machine, and then send that to a number of places using rsync. But what seems to happen wuth git is that it has a big pack file of objects, and the name of the opack file is the SHA1 of whatever is inside it. So if something chnages then the filename chnages - and thus rsync tries to move the entire lot all over again, even if the change is tiny. Does anyone have a solution to this ? Currently I am telling rsync to ignore .git when it sends the source, but am not entirely happy with that. But apart from that, git works fine ;) -pete. From owner-freebsd-stable@freebsd.org Tue Jan 5 13:56:21 2021 Return-Path: Delivered-To: freebsd-stable@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 656614E5DC9 for ; Tue, 5 Jan 2021 13:56:21 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smtp-relay-int.realworks.nl (smtp-relay-int.realworks.nl [194.109.157.24]) (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) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9DYc2Kn5z4V89 for ; Tue, 5 Jan 2021 13:56:19 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Date: Tue, 5 Jan 2021 14:56:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1609854977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WlyLcTzupY1qgXRG7lytfYnMjF6yW4+MtxKEjJ6sAUk=; b=jAI34KsByfCMB4zYPmtGPq5vOKcahuqajTPml2LU0RMbm86W9EjrLn8PF9qkHKRXCRYzCY JBhDjCFl7Teb0HULzazBsol4RUJRUj0134yHbuRSRKRi2rpkKXcP34O0FTvDTLG2t2cUkp XJux7vaHWGOG691dTw7ExFdlg/OYrsq7qJGF/qzfkA6wVxYi0Z80SMffxM0PzLQiPIv2NI rwjlnKM3nSCBe/sE9xLio3sHSFrQ9a027AwwNUvOriXtf7sSc1KgZ9EYQ1LusKN25hE2P1 xaCltRSfgTsYHRYMAul4w+0O6OBffA71tS6kwNPgBm12E9IsFJMeBB4Z58TE+w== From: Ronald Klop To: FreeBSD Stable Mailing List Message-ID: <751004982.112.1609854976464@localhost> In-Reply-To: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> References: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> Subject: Re: How to handle the pack files now we have switched to git? MIME-Version: 1.0 X-Mailer: Realworks (541.166.6317d621bbc) Importance: Normal X-Priority: 3 (Normal) X-Rspamd-Queue-Id: 4D9DYc2Kn5z4V89 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=klop.ws header.s=rw2 header.b=jAI34KsB; dmarc=pass (policy=none) header.from=klop.ws; spf=pass (mx1.freebsd.org: domain of ronald-lists@klop.ws designates 194.109.157.24 as permitted sender) smtp.mailfrom=ronald-lists@klop.ws X-Spamd-Result: default: False [-2.50 / 15.00]; ARC_NA(0.00)[]; RWL_MAILSPIKE_VERYGOOD(0.00)[194.109.157.24:from]; R_DKIM_ALLOW(-0.20)[klop.ws:s=rw2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:194.109.157.0/24]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_ONE(0.00)[1]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[klop.ws:+]; DMARC_POLICY_ALLOW(-0.50)[klop.ws,none]; HAS_X_PRIO_THREE(0.00)[3]; RCVD_IN_DNSWL_NONE(0.00)[194.109.157.24:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL]; MID_RHS_NOT_FQDN(0.50)[]; MAILMAN_DEST(0.00)[freebsd-stable] Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2021 13:56:21 -0000 Van: Pete French Datum: dinsdag, 5 januari 2021 12:08 Aan: FreeBSD Stable Mailing List Onderwerp: How to handle the pack files now we have switched to git? > > So, for me the switch to git went very smoothly. I havent moved to etcupdate yet, but will probably do that soon. Hopwever I did hit one issue. What I do is to build on a single machine, and then send that to a number of places using rsync. > > But what seems to happen wuth git is that it has a big pack file of objects, and the name of the opack file is the SHA1 of whatever is inside it. So if something chnages then the filename chnages - and thus rsync tries to move the entire lot all over again, even if the change is tiny. > > Does anyone have a solution to this ? Currently I am telling rsync to ignore .git when it sends the source, but am not entirely happy with that. > > But apart from that, git works fine ;) > > -pete. > _______________________________________________ > freebsd-stable@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" > > > Why are you not happy with ignoring .git? It sounds like a pretty reasonable thing to do for your setup. Otherwise (if you keep the .git dir) there is nothing you can do about this (AFAIK) and you will rsync quite some data now and then. Regards, Ronald. From owner-freebsd-stable@freebsd.org Tue Jan 5 15:58:23 2021 Return-Path: Delivered-To: freebsd-stable@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 EF6BE4C0839 for ; Tue, 5 Jan 2021 15:58:23 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (static-24-113-41-81.wavecable.com [24.113.41.81]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "ultimatedns.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9HGR3t98z4f2w for ; Tue, 5 Jan 2021 15:58:23 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 105FwLV9014170 for ; Tue, 5 Jan 2021 07:58:27 -0800 (PST) (envelope-from bsd-lists@bsdforge.com) MIME-Version: 1.0 Date: Tue, 05 Jan 2021 07:58:21 -0800 From: Chris To: freebsd-stable@freebsd.org Subject: Re: How to handle the pack files now we have switched to git? In-Reply-To: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> References: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> User-Agent: UDNSMS/17.0 Message-ID: <29bff715b10eabac5559742d7df88a5b@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D9HGR3t98z4f2w X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2021 15:58:24 -0000 On 2021-01-05 03:08, Pete French wrote: > So, for me the switch to git went very smoothly. I havent moved to etcupdate > yet, > but will probably do that soon. Hopwever I did hit one issue. What I do is > to > build on a single machine, and then send that to a number of places using > rsync. > > But what seems to happen wuth git is that it has a big pack file of objects, > and > the name of the opack file is the SHA1 of whatever is inside it. So if > something > chnages then the filename chnages - and thus rsync tries to move the entire > lot > all over again, even if the change is tiny. > > Does anyone have a solution to this ? Currently I am telling rsync to ignore > .git > when it sends the source, but am not entirely happy with that. > > But apart from that, git works fine ;) Brilliant minds think alike. I use nearly the same routine. ;-) Have been doing so on svn(1) as well. FWIW the only difference between passing the archive with vs without the .git. Is that getting the details of what rev the source is at will not be available without the .git. Same on svn. For me this is only a minor inconvenience. To help overcome this in the past. I issued a 'svn info /usr/src >./SRC-REV'. Then simply passed that file along to the receiving host(s). OTOH it won't be (easily) possible to "up" the repo(s) from the receiving hosts w/o the .git. HTH --Chris > > -pete. > _______________________________________________ > freebsd-stable@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" From owner-freebsd-stable@freebsd.org Wed Jan 6 14:05:14 2021 Return-Path: Delivered-To: freebsd-stable@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 5A45E4D18EA for ; Wed, 6 Jan 2021 14:05:14 +0000 (UTC) (envelope-from petefrench@ingresso.co.uk) Received: from constantine.ingresso.co.uk (constantine.ingresso.co.uk [31.24.6.74]) (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) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9rjP47WYz3qwW for ; Wed, 6 Jan 2021 14:05:12 +0000 (UTC) (envelope-from petefrench@ingresso.co.uk) Received: from [2001:470:6cc4:1:cd6:5836:ddba:7b54] (helo=balta.drayhouse.twisted.org.uk) by constantine.ingresso.co.uk with esmtpsa (TLS1.3) tls TLS_AES_128_GCM_SHA256 (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kx9Qv-0008Up-3k for freebsd-stable@freebsd.org; Wed, 06 Jan 2021 14:05:05 +0000 Subject: Re: How to handle the pack files now we have switched to git? To: freebsd-stable@freebsd.org References: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> <29bff715b10eabac5559742d7df88a5b@bsdforge.com> From: Pete French Message-ID: <1d0ab320-061f-e8d0-eb27-5f3cd33fbbe5@ingresso.co.uk> Date: Wed, 6 Jan 2021 14:05:04 +0000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <29bff715b10eabac5559742d7df88a5b@bsdforge.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D9rjP47WYz3qwW X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=ingresso.co.uk; spf=pass (mx1.freebsd.org: domain of petefrench@ingresso.co.uk designates 31.24.6.74 as permitted sender) smtp.mailfrom=petefrench@ingresso.co.uk X-Spamd-Result: default: False [-2.71 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[31.24.6.74:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:31.24.6.74]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[31.24.6.74:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[ingresso.co.uk,none]; NEURAL_HAM_SHORT(-0.91)[-0.906]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16082, ipnet:31.24.0.0/21, country:GB]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 14:05:14 -0000 On 05/01/2021 15:58, Chris wrote: > Brilliant minds think alike. I use nearly the same routine. ;-) Always good to know that I am not doing something completely idiotic ;) > OTOH it won't be (easily) possible to "up" the repo(s) from the > receiving hosts w/o the .git. Yes, this is my issue really. Because though I liek to think I have one place which builds the system and rsyncs it out, in practice here are three of them, and each of them can push to the otjers. Which one I use rather depoends where I am, and what I am doing - which is a problem which has become more acute in the current world! What I have decided to do is keep the.git on all fo them, but not rsycn it, and to 'git pull' at the same time in each place - a 'it status' will show me if any files are actually different after the rsync. Should work fine I think. thanks, -pete. From owner-freebsd-stable@freebsd.org Wed Jan 6 15:47:59 2021 Return-Path: Delivered-To: freebsd-stable@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 BA79B4D494B for ; Wed, 6 Jan 2021 15:47:59 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9tzz2KhBz4TMg for ; Wed, 6 Jan 2021 15:47:59 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 106FltiT035643 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 6 Jan 2021 16:47:56 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 6 Jan 2021 16:47:55 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Pete French Cc: FreeBSD Stable Mailing List Subject: Re: How to handle the pack files now we have switched to git? Message-ID: Mail-Followup-To: Pete French , FreeBSD Stable Mailing List References: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> User-Agent: Mutt/2.0.2 (2020-11-20) X-Rspamd-Queue-Id: 4D9tzz2KhBz4TMg X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 15:47:59 -0000 On Tue, 2021-01-05 at 11:08:48 +0000, Pete French wrote: >So, for me the switch to git went very smoothly. I havent moved to >etcupdate yet, but will probably do that soon. Hopwever I did hit one >issue. What I do is to build on a single machine, and then send that to >a number of places using rsync. > >But what seems to happen wuth git is that it has a big pack file of >objects, and the name of the opack file is the SHA1 of whatever is >inside it. So if something chnages then the filename chnages - and thus >rsync tries to move the entire lot all over again, even if the change is >tiny. That's not entirely correct. The packfile will only be rewritten if a) enough other stuff has accumulated b) you force a repack. You are fighting against git's GC mechanism a bit here, but you can still make it work. On your source of truth host, do the following: 1. git gc --aggressive 2. look at .git/objects/pack, there should be a single big pack 3. touch .git/objects/pack/pack-.keep (or was it .pack.keep?) 4. rsync --del to all other hosts Now future git gc runs will not delete that big pack, you'll only get churn in the new, much smaller, packs. hth Uli From owner-freebsd-stable@freebsd.org Fri Jan 8 10:47:43 2021 Return-Path: Delivered-To: freebsd-stable@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 C6C484C549D for ; Fri, 8 Jan 2021 10:47:43 +0000 (UTC) (envelope-from petefrench@ingresso.co.uk) Received: from constantine.ingresso.co.uk (constantine.ingresso.co.uk [31.24.6.74]) (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) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DC0DZ52wXz3R08 for ; Fri, 8 Jan 2021 10:47:42 +0000 (UTC) (envelope-from petefrench@ingresso.co.uk) Received: from [2001:470:6cc4:1:cd6:5836:ddba:7b54] (helo=balta.drayhouse.twisted.org.uk) by constantine.ingresso.co.uk with esmtpsa (TLS1.3) tls TLS_AES_128_GCM_SHA256 (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kxpIt-000Csm-68 for freebsd-stable@freebsd.org; Fri, 08 Jan 2021 10:47:35 +0000 Subject: Re: How to handle the pack files now we have switched to git? To: freebsd-stable@freebsd.org References: <22d067ae-c204-0dc5-4195-2d1c07f35560@ingresso.co.uk> From: Pete French Message-ID: <2850cb71-6471-d672-25bc-eafb16c75954@ingresso.co.uk> Date: Fri, 8 Jan 2021 10:47:34 +0000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4DC0DZ52wXz3R08 X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=ingresso.co.uk; spf=pass (mx1.freebsd.org: domain of petefrench@ingresso.co.uk designates 31.24.6.74 as permitted sender) smtp.mailfrom=petefrench@ingresso.co.uk X-Spamd-Result: default: False [1.18 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[31.24.6.74:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:31.24.6.74]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[31.24.6.74:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.98)[0.975]; DMARC_POLICY_ALLOW(-0.50)[ingresso.co.uk,none]; NEURAL_SPAM_LONG(1.00)[1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16082, ipnet:31.24.0.0/21, country:GB]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2021 10:47:43 -0000 On 06/01/2021 15:47, Ulrich Spörlein wrote: > That's not entirely correct. The packfile will only be rewritten if > a) enough other stuff has accumulated > b) you force a repack. > > You are fighting against git's GC mechanism a bit here, but you can > still make it work. On your source of truth host, do the following: > > 1. git gc --aggressive > 2. look at .git/objects/pack, there should be a single big pack > 3. touch .git/objects/pack/pack-.keep  (or was it > .pack.keep?) > 4. rsync --del to all other hosts > > Now future git gc runs will not delete that big pack, you'll only get > churn in the new, much smaller, packs. I missed seeing this until now, sorry, but thankyou! This is excellent, and looks like a much better solution - or at least one which lets me know 100% that I have percisely the same files on each machine. I will gve this a try next time I need to do an update. thanks, -pete.