From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 31 20:07:26 2020 Received: (at submit) by debbugs.gnu.org; 1 Jan 2021 01:07:26 +0000 Received: from localhost ([127.0.0.1]:41904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv8ub-0005pO-89 for submit@debbugs.gnu.org; Thu, 31 Dec 2020 20:07:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:56810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv7SP-0003eR-BV for submit@debbugs.gnu.org; Thu, 31 Dec 2020 18:34:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv7SP-0007jh-5A for guix-patches@gnu.org; Thu, 31 Dec 2020 18:34:13 -0500 Received: from mail4.protonmail.ch ([185.70.40.27]:16874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv7SM-0004JQ-In for guix-patches@gnu.org; Thu, 31 Dec 2020 18:34:12 -0500 Date: Thu, 31 Dec 2020 23:34:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609457642; bh=Xv+hXuIOsWjx1tMMFZPj8oBNT4/NW8PBvJmsGX5RQAQ=; h=Date:To:From:Reply-To:Subject:From; b=G1eHk3HCoUUUphr5EEShZx7d0pwdEi1o5kDQqNR2ov90fOgJyduJ9gGCwUEZVQziA N6brp9neXl12X/2mP3ElgRxfqAsOtgsOY2YyxQ2b+6YglA1UDRJFpZDgu8h1zBfwfl 8hoZJB1Rcwdvpp6EClp6y2nmiVNSxoOPyRl/wxxs= To: "guix-patches@gnu.org" From: Caliph Nomble Subject: [PATCH 0/2] system: image: Fix root fs corruption from certain u-boot. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Received-SPF: pass client-ip=185.70.40.27; envelope-from=calnomble@protonmail.com; helo=mail4.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 31 Dec 2020 20:07:24 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Caliph Nomble Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi, u-boot for pretty much every rockchip system supported installs to an offse= t of 8MB, which is currently in the middle of generated disk images' root filesystems. This patchset adds another disk-image option for devices that require a larger root offset, and configures the pinebook-pro image to use = it. I chose a 9MB offset by adding the previous root offset of 1MB to the additional 8MB offset required. I know at least u-boot-rockpro64-rk3399 doe= sn't build to over 1MB in size, so it should be fine? Feel free to change the specific offset used. Thanks! From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 31 20:12:05 2020 Received: (at 45584) by debbugs.gnu.org; 1 Jan 2021 01:12:05 +0000 Received: from localhost ([127.0.0.1]:41909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv8z7-0005wZ-E5 for submit@debbugs.gnu.org; Thu, 31 Dec 2020 20:12:05 -0500 Received: from mail-40140.protonmail.ch ([185.70.40.140]:20199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv8z5-0005w4-E8 for 45584@debbugs.gnu.org; Thu, 31 Dec 2020 20:12:04 -0500 Date: Fri, 01 Jan 2021 01:11:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609463516; bh=/KhRO8G9ENFwLEIc4Q57aTkp90cOts8CM0goSFWp1r4=; h=Date:To:From:Cc:Reply-To:Subject:From; b=FHSWjDYHYTqswDySRzQtk7NQ8PfHBqOpdnm4fHtfp22T1h7w2zbsuhcxfkMcII5f9 MK8S0vh5EOgpYY/BleEkhl8m23ORFaJj4KB4a9HXrhxj/7uTRbt7ZKN/ppxMVK/eH2 q2ewbdDDmhMS5VuMwcai5BxxOLrhOV3y6squ5/JE= To: 45584@debbugs.gnu.org From: Caliph Nomble Subject: [PATCH 1/2] system: image: Add support for rockchip bootloader offsets. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45584 Cc: Caliph Nomble X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Caliph Nomble Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/system/image.scm (root-largeboot-offset, arm32-largeboot-disk-image, arm32-largeboot-image-type): New variables, used primarily to define... (arm64-largeboot-disk-image, arm64-largeboot-image-type): ...these new variables. --- gnu/system/image.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 67930750d5..58d92cf4b6 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -59,6 +59,7 @@ #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (root-offset + root-largeboot-offset root-label =20 esp-partition @@ -67,7 +68,9 @@ efi-disk-image iso9660-image arm32-disk-image + arm32-largeboot-disk-image arm64-disk-image + arm64-largeboot-disk-image =20 image-with-os raw-image-type @@ -75,7 +78,9 @@ iso-image-type uncompressed-iso-image-type arm32-image-type + arm32-largeboot-image-type arm64-image-type + arm64-largeboot-image-type =20 image-with-label system-image @@ -92,6 +97,10 @@ ;; this post-MBR gap. (define root-offset (* 512 2048)) =20 +;; Same as above, except 9MB big. Necessary for eg. rk3399 and rk3328 +;; systems, which install the bootloader at an 8MB offset. +(define root-largeboot-offset (+ root-offset (* 8 (expt 2 20)))) + ;; Generic root partition label. (define root-label "Guix_image") =20 @@ -140,11 +149,24 @@ ;; fails. (volatile-root? #f))) =20 +(define arm32-largeboot-disk-image + (image + (inherit arm32-disk-image) + (partitions + (list (partition + (inherit root-partition) + (offset root-largeboot-offset)))))) + (define arm64-disk-image (image (inherit arm32-disk-image) (target "aarch64-linux-gnu"))) =20 +(define arm64-largeboot-disk-image + (image + (inherit arm32-largeboot-disk-image) + (target "aarch64-linux-gnu"))) + =0C ;;; ;;; Images types. @@ -191,11 +213,21 @@ set to the given OS." (name 'arm32-raw) (constructor (cut image-with-os arm32-disk-image <>)))) =20 +(define arm32-largeboot-image-type + (image-type + (name 'arm32-largeboot-raw) + (constructor (cut image-with-os arm32-largeboot-disk-image <>)))) + (define arm64-image-type (image-type (name 'arm64-raw) (constructor (cut image-with-os arm64-disk-image <>)))) =20 +(define arm64-largeboot-image-type + (image-type + (name 'arm64-largeboot-raw) + (constructor (cut image-with-os arm64-largeboot-disk-image <>)))) + =0C ;; ;; Helpers. --=20 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 31 20:12:14 2020 Received: (at 45584) by debbugs.gnu.org; 1 Jan 2021 01:12:15 +0000 Received: from localhost ([127.0.0.1]:41912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv8zG-0005wx-NY for submit@debbugs.gnu.org; Thu, 31 Dec 2020 20:12:14 -0500 Received: from mail4.protonmail.ch ([185.70.40.27]:62955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv8zF-0005wi-8n for 45584@debbugs.gnu.org; Thu, 31 Dec 2020 20:12:13 -0500 Date: Fri, 01 Jan 2021 01:12:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609463527; bh=lChA+v0owkEYUfFpqAd8txphMblqYnnUkl79MzrFv1g=; h=Date:To:From:Cc:Reply-To:Subject:From; b=RlUpxFo3X/1MYP+HEelSHPusJRMWr//KmYJZjDj1nhvDACpms8lJkgcOEMGQmZCYC vWHiZWbDFWRNY0UUvMNnwFhAU1qg2AOYjKqaOq0O8hjayTKg3d//rns/dlkjxi9kxr HQ0OuMel75EF3hzqxpy6b4zS+oB3NC7Nc82Rxvgo= To: 45584@debbugs.gnu.org From: Caliph Nomble Subject: [PATCH 2/2] image: pinebook-pro: Fix pinebook-pro root filesystem. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45584 Cc: Caliph Nomble X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Caliph Nomble Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/system/images/pinebook-pro.scm (pinebook-pro-image-type): Use arm64-largeboot-disk-image instead of arm64-disk-image. --- gnu/system/images/pinebook-pro.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/images/pinebook-pro.scm b/gnu/system/images/pineboo= k-pro.scm index b038e262cb..e4bb808e3c 100644 --- a/gnu/system/images/pinebook-pro.scm +++ b/gnu/system/images/pinebook-pro.scm @@ -57,7 +57,7 @@ (define pinebook-pro-image-type (image-type (name 'pinebook-pro-raw) - (constructor (cut image-with-os arm64-disk-image <>)))) + (constructor (cut image-with-os arm64-largeboot-disk-image <>)))) =20 (define pinebook-pro-barebones-raw-image (image --=20 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 01 11:10:46 2021 Received: (at submit) by debbugs.gnu.org; 1 Jan 2021 16:10:46 +0000 Received: from localhost ([127.0.0.1]:34583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvN0o-0006Qa-Bt for submit@debbugs.gnu.org; Fri, 01 Jan 2021 11:10:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:45224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvN0n-0006QR-Ee for submit@debbugs.gnu.org; Fri, 01 Jan 2021 11:10:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvN0n-0001B8-9l for guix-patches@gnu.org; Fri, 01 Jan 2021 11:10:45 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58313) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvN0l-0005AD-TH; Fri, 01 Jan 2021 11:10:43 -0500 Received: from pop.92-184-97-149.mobile.abo.orange.fr ([92.184.97.149]:58778 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kvN0l-0005Lh-2W; Fri, 01 Jan 2021 11:10:43 -0500 From: Mathieu Othacehe To: Caliph Nomble via Guix-patches via Subject: Re: [bug#45584] [PATCH 0/2] system: image: Fix root fs corruption from certain u-boot. References: Date: Fri, 01 Jan 2021 17:10:38 +0100 In-Reply-To: (Caliph Nomble via Guix-patches via's message of "Thu, 31 Dec 2020 23:34:01 +0000") Message-ID: <87zh1swsch.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: vagrant@debian.org, dannym@scratchpost.org, Caliph Nomble , 45584@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, > I chose a 9MB offset by adding the previous root offset of 1MB to the > additional 8MB offset required. I know at least u-boot-rockpro64-rk3399 doesn't > build to over 1MB in size, so it should be fine? Feel free to change the > specific offset used. This seems reasonable to me. We could also turn "arm32-disk-image" and "arm64-disk-image" into procedures and pass the root offset as argument to avoid multiplying image types. Danny, Vagrant, any opinion? Were you able to actually use the generated image on a pinebook-pro? I added support for this machine without being able to test it. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 01 18:32:56 2021 Received: (at 45584) by debbugs.gnu.org; 1 Jan 2021 23:32:56 +0000 Received: from localhost ([127.0.0.1]:35038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvTui-0004e8-LZ for submit@debbugs.gnu.org; Fri, 01 Jan 2021 18:32:56 -0500 Received: from mail-40137.protonmail.ch ([185.70.40.137]:24795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvTuf-0004dt-Pd for 45584@debbugs.gnu.org; Fri, 01 Jan 2021 18:32:54 -0500 Date: Fri, 01 Jan 2021 23:32:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609543967; bh=EucyJif3MgERbVlmN1ks+UbpFIi9cly8KHmw8Qj7OKQ=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Lj6UvQaLBAjSg+PzA30C9nQG8rZs7grqxphZlobYQdbEmMVZqSxQ79noclR9oKghl ASjom06FGefeSXfdcejPJpp4xWgaaDsTOhKraNL9DuE3gV8ky7sD5cM5RW9uXkB12T sqKuRisFVy+ylVi/3221BiWxiAlHYGOXvyzjtN1E= To: "45584@debbugs.gnu.org" <45584@debbugs.gnu.org> From: Caliph Nomble Subject: Re: [bug#45584] [PATCH 0/2] system: image: Fix root fs corruption from certain u-boot. Message-ID: In-Reply-To: <87zh1swsch.fsf@gnu.org> References: <87zh1swsch.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45584 Cc: "othacehe@gnu.org" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Caliph Nomble Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, > This seems reasonable to me. We could also turn "arm32-disk-image" and > "arm64-disk-image" into procedures and pass the root offset as argument > to avoid multiplying image types. Danny, Vagrant, any opinion? I was originally considering doing something like that, but I was unsure ho= w that'd interact with --image-type (unless there's another way to specify an image that I don't know of)? Would there still just be multiple image-types= but with procedural disk-images? > Were you able to actually use the generated image on a pinebook-pro? I > added support for this machine without being able to test it. I just tried to use it on one, but I was unable to get it to boot. I'm not = sure why, exactly, as I didn't have a chance to open it up to enable serial. Cou= ld just be the kernel, seeing as wip-pinebook-pro has its own patched linux-li= bre (which I was unable to get working with an inferior on the main branch, but I don't really know how to use them anyway). I did, however, test these changes on a rockpro64 (both pinebook-pro and rockpro64 use the rk3399 SoC), and it did fix fs corruption preventing prop= er boot. Thanks! From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 02 12:03:41 2021 Received: (at 45584) by debbugs.gnu.org; 2 Jan 2021 17:03:41 +0000 Received: from localhost ([127.0.0.1]:60596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvkJY-0004CQ-JT for submit@debbugs.gnu.org; Sat, 02 Jan 2021 12:03:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvkJW-0004CA-3e for 45584@debbugs.gnu.org; Sat, 02 Jan 2021 12:03:39 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:56631) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvkJQ-0007mO-Ty; Sat, 02 Jan 2021 12:03:32 -0500 Received: from pop.92-184-107-157.mobile.abo.orange.fr ([92.184.107.157]:33830 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kvkJG-0004GB-3b; Sat, 02 Jan 2021 12:03:28 -0500 From: Mathieu Othacehe To: Caliph Nomble Subject: Re: [bug#45584] [PATCH 0/2] system: image: Fix root fs corruption from certain u-boot. References: <87zh1swsch.fsf@gnu.org> Date: Sat, 02 Jan 2021 18:03:18 +0100 In-Reply-To: (Caliph Nomble's message of "Fri, 01 Jan 2021 23:32:41 +0000") Message-ID: <87zh1rp8yx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45584 Cc: "45584@debbugs.gnu.org" <45584@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Hey, > I was originally considering doing something like that, but I was unsure how > that'd interact with --image-type (unless there's another way to specify an > image that I don't know of)? Would there still just be multiple image-types but > with procedural disk-images? Here's an attached patch that should do that, but I'm not sure it brings a real improvement, unless there are a lot of different offset out there. >> Were you able to actually use the generated image on a pinebook-pro? I >> added support for this machine without being able to test it. > > I just tried to use it on one, but I was unable to get it to boot. I'm not sure > why, exactly, as I didn't have a chance to open it up to enable serial. Could > just be the kernel, seeing as wip-pinebook-pro has its own patched linux-libre > (which I was unable to get working with an inferior on the main branch, but > I don't really know how to use them anyway). It looks like the wip-pinebook-pro is adding some kernel patches, maybe you could try to apply them directly on master? > I did, however, test these changes on a rockpro64 (both pinebook-pro and > rockpro64 use the rk3399 SoC), and it did fix fs corruption preventing proper > boot. That's nice, thanks for your work! Mathieu --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-offset.patch >From 2c0806c28ae5ca07cba136ce2e32a7de0702693d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 2 Jan 2021 17:56:25 +0100 Subject: [PATCH] offset --- gnu/system/image.scm | 12 ++++++------ gnu/system/images/novena.scm | 2 +- gnu/system/images/pine64.scm | 2 +- gnu/system/images/pinebook-pro.scm | 4 +++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 67930750d5..90b9209988 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -128,21 +128,21 @@ (label "GUIX_IMAGE") (flags '(boot))))))) -(define arm32-disk-image +(define* (arm32-disk-image #:optional (offset root-offset)) (image (format 'disk-image) (target "arm-linux-gnueabihf") (partitions (list (partition (inherit root-partition) - (offset root-offset)))) + (offset offset)))) ;; FIXME: Deleting and creating "/var/run" and "/tmp" on the overlayfs ;; fails. (volatile-root? #f))) -(define arm64-disk-image +(define* (arm64-disk-image #:optional (offset root-offset)) (image - (inherit arm32-disk-image) + (inherit (arm32-disk-image offset)) (target "aarch64-linux-gnu"))) @@ -189,12 +189,12 @@ set to the given OS." (define arm32-image-type (image-type (name 'arm32-raw) - (constructor (cut image-with-os arm32-disk-image <>)))) + (constructor (cut image-with-os (arm32-disk-image) <>)))) (define arm64-image-type (image-type (name 'arm64-raw) - (constructor (cut image-with-os arm64-disk-image <>)))) + (constructor (cut image-with-os (arm64-disk-image) <>)))) ;; diff --git a/gnu/system/images/novena.scm b/gnu/system/images/novena.scm index c4d25e850e..dfaf2c60ee 100644 --- a/gnu/system/images/novena.scm +++ b/gnu/system/images/novena.scm @@ -52,7 +52,7 @@ (define novena-image-type (image-type (name 'novena-raw) - (constructor (cut image-with-os arm32-disk-image <>)))) + (constructor (cut image-with-os (arm32-disk-image) <>)))) (define novena-barebones-raw-image (image diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm index f0b0c3f50d..63b31399a5 100644 --- a/gnu/system/images/pine64.scm +++ b/gnu/system/images/pine64.scm @@ -57,7 +57,7 @@ (define pine64-image-type (image-type (name 'pine64-raw) - (constructor (cut image-with-os arm64-disk-image <>)))) + (constructor (cut image-with-os (arm64-disk-image) <>)))) (define pine64-barebones-raw-image (image diff --git a/gnu/system/images/pinebook-pro.scm b/gnu/system/images/pinebook-pro.scm index b038e262cb..02a0b8132d 100644 --- a/gnu/system/images/pinebook-pro.scm +++ b/gnu/system/images/pinebook-pro.scm @@ -57,7 +57,9 @@ (define pinebook-pro-image-type (image-type (name 'pinebook-pro-raw) - (constructor (cut image-with-os arm64-disk-image <>)))) + (constructor (cut image-with-os + (arm64-disk-image (* 9 (expt 2 20))) ;9MiB + <>)))) (define pinebook-pro-barebones-raw-image (image -- 2.29.2 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 09 19:48:47 2021 Received: (at 45584) by debbugs.gnu.org; 10 Jan 2021 00:48:48 +0000 Received: from localhost ([127.0.0.1]:52807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyOuV-0005Nd-Gm for submit@debbugs.gnu.org; Sat, 09 Jan 2021 19:48:47 -0500 Received: from mail-40140.protonmail.ch ([185.70.40.140]:44838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyOuT-0005NB-5e for 45584@debbugs.gnu.org; Sat, 09 Jan 2021 19:48:46 -0500 Date: Sun, 10 Jan 2021 00:48:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1610239718; bh=SsOu4OQgpUsS5v0fkWX9o+QvPAi3JhT1o65XH4qDy6U=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=uUqLUQGMdxb1bTAttT3p17Lg7L/IK2EqUvxhY7qc3NnCXOxO8agrekc3TYKLt0peF /+V/fGVPUJ8BweWODwQHMpW5mK5k2ZvUs7iMPIZocmxYqUGRVrWdsp/B/mPqBvSaO0 3c8+OHn7MZrG1ppVOq3ifyFVUHgZhFVcQqGO57Sw= To: "45584@debbugs.gnu.org" <45584@debbugs.gnu.org> From: Caliph Nomble Subject: Re: [bug#45584] [PATCH 0/2] system: image: Fix root fs corruption from certain u-boot. Message-ID: In-Reply-To: <87zh1rp8yx.fsf@gnu.org> References: <87zh1swsch.fsf@gnu.org> <87zh1rp8yx.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_4t1gTmVmR4ePzVr7iwbWJL9cFhUPl5i1q2ogoCLInRY" X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45584 Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Caliph Nomble Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --b1_4t1gTmVmR4ePzVr7iwbWJL9cFhUPl5i1q2ogoCLInRY Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Sorry for the late response. I just got a chance to test on a pinebook-pro,= and was able to use a generated image on it. Screen wouldn't turn on but I got = a functioning shell on serial; I was still just using mainline linux-libre-arm64-generic so I don't think that's a bootloader problem. > Here's an attached patch that should do that, but I'm not sure it brings > a real improvement, unless there are a lot of different offset out > there. I'm all for extensability, so that sounds good to me. Over the past few days I've been playing with u-boot, and I think that the install offset may be configurable, with the current offset just being used= for compatability with Rockchip's proprietary miniloader. I could make a patchs= et to move u-boot up and test it out on the pinebook-pro and rockpro64, if tha= t would be a better solution? Thanks! --b1_4t1gTmVmR4ePzVr7iwbWJL9cFhUPl5i1q2ogoCLInRY Content-Type: text/x-diff; name=0001-offset.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-offset.patch RnJvbSAyYzA4MDZjMjhhZTVjYTA3Y2JhMTM2Y2UyZTMyYTdkZTA3MDI2OTNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXRoaWV1IE90aGFjZWhlIDxvdGhhY2VoZUBnbnUub3JnPgpE YXRlOiBTYXQsIDIgSmFuIDIwMjEgMTc6NTY6MjUgKzAxMDAKU3ViamVjdDogW1BBVENIXSBvZmZz ZXQKCi0tLQogZ251L3N5c3RlbS9pbWFnZS5zY20gICAgICAgICAgICAgICB8IDEyICsrKysrKy0t LS0tLQogZ251L3N5c3RlbS9pbWFnZXMvbm92ZW5hLnNjbSAgICAgICB8ICAyICstCiBnbnUvc3lz dGVtL2ltYWdlcy9waW5lNjQuc2NtICAgICAgIHwgIDIgKy0KIGdudS9zeXN0ZW0vaW1hZ2VzL3Bp bmVib29rLXByby5zY20gfCAgNCArKystCiA0IGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMo KyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3N5c3RlbS9pbWFnZS5zY20gYi9n bnUvc3lzdGVtL2ltYWdlLnNjbQppbmRleCA2NzkzMDc1MGQ1Li45MGI5MjA5OTg4IDEwMDY0NAot LS0gYS9nbnUvc3lzdGVtL2ltYWdlLnNjbQorKysgYi9nbnUvc3lzdGVtL2ltYWdlLnNjbQpAQCAt MTI4LDIxICsxMjgsMjEgQEAKICAgICAgICAgICAgKGxhYmVsICJHVUlYX0lNQUdFIikKICAgICAg ICAgICAgKGZsYWdzICcoYm9vdCkpKSkpKSkKIAotKGRlZmluZSBhcm0zMi1kaXNrLWltYWdlCiso ZGVmaW5lKiAoYXJtMzItZGlzay1pbWFnZSAjOm9wdGlvbmFsIChvZmZzZXQgcm9vdC1vZmZzZXQp KQogICAoaW1hZ2UKICAgIChmb3JtYXQgJ2Rpc2staW1hZ2UpCiAgICAodGFyZ2V0ICJhcm0tbGlu dXgtZ251ZWFiaWhmIikKICAgIChwYXJ0aXRpb25zCiAgICAgKGxpc3QgKHBhcnRpdGlvbgogICAg ICAgICAgICAoaW5oZXJpdCByb290LXBhcnRpdGlvbikKLSAgICAgICAgICAgKG9mZnNldCByb290 LW9mZnNldCkpKSkKKyAgICAgICAgICAgKG9mZnNldCBvZmZzZXQpKSkpCiAgICA7OyBGSVhNRTog RGVsZXRpbmcgYW5kIGNyZWF0aW5nICIvdmFyL3J1biIgYW5kICIvdG1wIiBvbiB0aGUgb3Zlcmxh eWZzCiAgICA7OyBmYWlscy4KICAgICh2b2xhdGlsZS1yb290PyAjZikpKQogCi0oZGVmaW5lIGFy bTY0LWRpc2staW1hZ2UKKyhkZWZpbmUqIChhcm02NC1kaXNrLWltYWdlICM6b3B0aW9uYWwgKG9m ZnNldCByb290LW9mZnNldCkpCiAgIChpbWFnZQotICAgKGluaGVyaXQgYXJtMzItZGlzay1pbWFn ZSkKKyAgIChpbmhlcml0IChhcm0zMi1kaXNrLWltYWdlIG9mZnNldCkpCiAgICAodGFyZ2V0ICJh YXJjaDY0LWxpbnV4LWdudSIpKSkKIAogDApAQCAtMTg5LDEyICsxODksMTIgQEAgc2V0IHRvIHRo ZSBnaXZlbiBPUy4iCiAoZGVmaW5lIGFybTMyLWltYWdlLXR5cGUKICAgKGltYWdlLXR5cGUKICAg IChuYW1lICdhcm0zMi1yYXcpCi0gICAoY29uc3RydWN0b3IgKGN1dCBpbWFnZS13aXRoLW9zIGFy bTMyLWRpc2staW1hZ2UgPD4pKSkpCisgICAoY29uc3RydWN0b3IgKGN1dCBpbWFnZS13aXRoLW9z IChhcm0zMi1kaXNrLWltYWdlKSA8PikpKSkKIAogKGRlZmluZSBhcm02NC1pbWFnZS10eXBlCiAg IChpbWFnZS10eXBlCiAgICAobmFtZSAnYXJtNjQtcmF3KQotICAgKGNvbnN0cnVjdG9yIChjdXQg aW1hZ2Utd2l0aC1vcyBhcm02NC1kaXNrLWltYWdlIDw+KSkpKQorICAgKGNvbnN0cnVjdG9yIChj dXQgaW1hZ2Utd2l0aC1vcyAoYXJtNjQtZGlzay1pbWFnZSkgPD4pKSkpCiAKIAwKIDs7CmRpZmYg LS1naXQgYS9nbnUvc3lzdGVtL2ltYWdlcy9ub3ZlbmEuc2NtIGIvZ251L3N5c3RlbS9pbWFnZXMv bm92ZW5hLnNjbQppbmRleCBjNGQyNWU4NTBlLi5kZmFmMmM2MGVlIDEwMDY0NAotLS0gYS9nbnUv c3lzdGVtL2ltYWdlcy9ub3ZlbmEuc2NtCisrKyBiL2dudS9zeXN0ZW0vaW1hZ2VzL25vdmVuYS5z Y20KQEAgLTUyLDcgKzUyLDcgQEAKIChkZWZpbmUgbm92ZW5hLWltYWdlLXR5cGUKICAgKGltYWdl LXR5cGUKICAgIChuYW1lICdub3ZlbmEtcmF3KQotICAgKGNvbnN0cnVjdG9yIChjdXQgaW1hZ2Ut d2l0aC1vcyBhcm0zMi1kaXNrLWltYWdlIDw+KSkpKQorICAgKGNvbnN0cnVjdG9yIChjdXQgaW1h Z2Utd2l0aC1vcyAoYXJtMzItZGlzay1pbWFnZSkgPD4pKSkpCiAKIChkZWZpbmUgbm92ZW5hLWJh cmVib25lcy1yYXctaW1hZ2UKICAgKGltYWdlCmRpZmYgLS1naXQgYS9nbnUvc3lzdGVtL2ltYWdl cy9waW5lNjQuc2NtIGIvZ251L3N5c3RlbS9pbWFnZXMvcGluZTY0LnNjbQppbmRleCBmMGIwYzNm NTBkLi42M2IzMTM5OWE1IDEwMDY0NAotLS0gYS9nbnUvc3lzdGVtL2ltYWdlcy9waW5lNjQuc2Nt CisrKyBiL2dudS9zeXN0ZW0vaW1hZ2VzL3BpbmU2NC5zY20KQEAgLTU3LDcgKzU3LDcgQEAKIChk ZWZpbmUgcGluZTY0LWltYWdlLXR5cGUKICAgKGltYWdlLXR5cGUKICAgIChuYW1lICdwaW5lNjQt cmF3KQotICAgKGNvbnN0cnVjdG9yIChjdXQgaW1hZ2Utd2l0aC1vcyBhcm02NC1kaXNrLWltYWdl IDw+KSkpKQorICAgKGNvbnN0cnVjdG9yIChjdXQgaW1hZ2Utd2l0aC1vcyAoYXJtNjQtZGlzay1p bWFnZSkgPD4pKSkpCiAKIChkZWZpbmUgcGluZTY0LWJhcmVib25lcy1yYXctaW1hZ2UKICAgKGlt YWdlCmRpZmYgLS1naXQgYS9nbnUvc3lzdGVtL2ltYWdlcy9waW5lYm9vay1wcm8uc2NtIGIvZ251 L3N5c3RlbS9pbWFnZXMvcGluZWJvb2stcHJvLnNjbQppbmRleCBiMDM4ZTI2MmNiLi4wMmEwYjgx MzJkIDEwMDY0NAotLS0gYS9nbnUvc3lzdGVtL2ltYWdlcy9waW5lYm9vay1wcm8uc2NtCisrKyBi L2dudS9zeXN0ZW0vaW1hZ2VzL3BpbmVib29rLXByby5zY20KQEAgLTU3LDcgKzU3LDkgQEAKIChk ZWZpbmUgcGluZWJvb2stcHJvLWltYWdlLXR5cGUKICAgKGltYWdlLXR5cGUKICAgIChuYW1lICdw aW5lYm9vay1wcm8tcmF3KQotICAgKGNvbnN0cnVjdG9yIChjdXQgaW1hZ2Utd2l0aC1vcyBhcm02 NC1kaXNrLWltYWdlIDw+KSkpKQorICAgKGNvbnN0cnVjdG9yIChjdXQgaW1hZ2Utd2l0aC1vcwor ICAgICAgICAgICAgICAgICAgICAgKGFybTY0LWRpc2staW1hZ2UgKCogOSAoZXhwdCAyIDIwKSkp IDs5TWlCCisgICAgICAgICAgICAgICAgICAgICA8PikpKSkKIAogKGRlZmluZSBwaW5lYm9vay1w cm8tYmFyZWJvbmVzLXJhdy1pbWFnZQogICAoaW1hZ2UKLS0gCjIuMjkuMgoK --b1_4t1gTmVmR4ePzVr7iwbWJL9cFhUPl5i1q2ogoCLInRY-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 09 19:53:34 2021 Received: (at 45584) by debbugs.gnu.org; 10 Jan 2021 00:53:34 +0000 Received: from localhost ([127.0.0.1]:52812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyOz8-0005Uk-8x for submit@debbugs.gnu.org; Sat, 09 Jan 2021 19:53:34 -0500 Received: from mail-40141.protonmail.ch ([185.70.40.141]:49866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyOz6-0005UR-Q2 for 45584@debbugs.gnu.org; Sat, 09 Jan 2021 19:53:33 -0500 Date: Sun, 10 Jan 2021 00:53:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1610240006; bh=3cmZKYUpETVU21+i96gKxKy8C2uM2ggMXdwggFmzNLo=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=m86Y4o9Gd/+KUdX2rsKRGJ9TZIwuRwoNXoBZoQyQzrraQ5IvU+2sN7/VpAGU/96RO BbksY8x0r0W2sRYUPSpqQya73OGPjHyoCztz46QV6khc187SsR6s47NmkKzqA8grzc AlnQICXv5FCGLFQdHk0qI06LZUykfxH1Q7Jg+NJM= To: "45584@debbugs.gnu.org" <45584@debbugs.gnu.org> From: Caliph Nomble Subject: Re: [bug#45584] [PATCH 0/2] system: image: Fix root fs corruption from certain u-boot. Message-ID: In-Reply-To: References: <87zh1swsch.fsf@gnu.org> <87zh1rp8yx.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45584 Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Caliph Nomble Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Sorry, I accidentally attached your patch to my last message. Disregard it. From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 10 10:16:44 2021 Received: (at 45584-done) by debbugs.gnu.org; 10 Jan 2021 15:16:44 +0000 Received: from localhost ([127.0.0.1]:54669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kycSS-0000Zs-Ll for submit@debbugs.gnu.org; Sun, 10 Jan 2021 10:16:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kycSR-0000Zd-3V for 45584-done@debbugs.gnu.org; Sun, 10 Jan 2021 10:16:43 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:48220) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kycSL-0001AS-Uu; Sun, 10 Jan 2021 10:16:37 -0500 Received: from [2a01:e0a:19b:d9a0:d54b:f4e5:4687:8012] (port=41246 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kycSL-0001rM-Ho; Sun, 10 Jan 2021 10:16:37 -0500 From: Mathieu Othacehe To: Caliph Nomble Subject: Re: [bug#45584] [PATCH 0/2] system: image: Fix root fs corruption from certain u-boot. References: <87zh1swsch.fsf@gnu.org> <87zh1rp8yx.fsf@gnu.org> Date: Sun, 10 Jan 2021 16:16:36 +0100 In-Reply-To: (Caliph Nomble's message of "Sun, 10 Jan 2021 00:48:33 +0000") Message-ID: <871resg6uj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45584-done Cc: janneke@gnu.org, 45584-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, > Sorry for the late response. I just got a chance to test on a pinebook-pro, and > was able to use a generated image on it. Screen wouldn't turn on but I got a > functioning shell on serial; I was still just using mainline > linux-libre-arm64-generic so I don't think that's a bootloader problem. Many thanks for testing. I pushed the patch I proposed. > Over the past few days I've been playing with u-boot, and I think that the > install offset may be configurable, with the current offset just being used for > compatability with Rockchip's proprietary miniloader. I could make a patchset > to move u-boot up and test it out on the pinebook-pro and rockpro64, if that > would be a better solution? Sure that could be nice and in that case we could revert the 9MiB offset change in gnu/system/image/pinebook-pro.scm. I also found that janneke used some kernel-arguments that could maybe help you in this blog post: https://joyofsource.com/guix-system-on-the-pinebook-pro.html. Closing this one, Thanks, Mathieu From unknown Fri Sep 12 02:58:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 08 Feb 2021 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator