* [Buildroot] [PATCH v2 0/2] fix mpfs custom tarballs @ 2024-08-08 10:52 Jamie Gibbons via buildroot 2024-08-08 10:52 ` [Buildroot] [PATCH v2 1/2] fix: configs/beaglev_fire: update " Jamie Gibbons via buildroot 2024-08-08 10:52 ` [Buildroot] [PATCH v2 2/2] fix: configs/microchip_mpfs_icicle: " Jamie Gibbons via buildroot 0 siblings, 2 replies; 4+ messages in thread From: Jamie Gibbons via buildroot @ 2024-08-08 10:52 UTC (permalink / raw) To: buildroot; +Cc: Jamie Gibbons, Thomas Petazzoni Hi all, The following patchset updates the Linux kernel and U-Boot custom tarballs as they were updated incorrectly. Previously, they were retrieving from a branch, and storing it into a tarball. This is not the desired functionality. Now, the custom tarballs retrieve specific release tags instead, as intended. This has also meant an additional update to the U-Boot hash is required to match changes as the content has been updated. Thanks Thomas for your feedback on v1, greatly appreciated. Thanks, Jamie Jamie Gibbons (2): fix: configs/beaglev_fire: update custom tarballs fix: configs/microchip_mpfs_icicle: update custom tarballs board/beagleboard/beaglev_fire/patches/linux/linux.hash | 2 +- board/beagleboard/beaglev_fire/patches/uboot/uboot.hash | 2 +- board/microchip/mpfs_icicle/patches/linux/linux.hash | 2 +- board/microchip/mpfs_icicle/patches/uboot/uboot.hash | 2 +- configs/beaglev_fire_defconfig | 4 ++-- configs/microchip_mpfs_icicle_defconfig | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 1/2] fix: configs/beaglev_fire: update custom tarballs 2024-08-08 10:52 [Buildroot] [PATCH v2 0/2] fix mpfs custom tarballs Jamie Gibbons via buildroot @ 2024-08-08 10:52 ` Jamie Gibbons via buildroot 2024-08-08 20:06 ` Thomas Petazzoni via buildroot 2024-08-08 10:52 ` [Buildroot] [PATCH v2 2/2] fix: configs/microchip_mpfs_icicle: " Jamie Gibbons via buildroot 1 sibling, 1 reply; 4+ messages in thread From: Jamie Gibbons via buildroot @ 2024-08-08 10:52 UTC (permalink / raw) To: buildroot; +Cc: Jamie Gibbons, Prajna Rajendra Kumar, Thomas Petazzoni The Linux kernel and U-Boot custom tarballs were updated incorrectly. Update these to select specific release tags instead of branches. Update the U-Boot hash to match changes. Fixes:8ce97fd550d6("configs/beaglev_fire: bump Linux and U-Boot") Signed-off-by: Jamie Gibbons <jamie.gibbons@microchip.com> Tested-by: Prajna Rajendra Kumar <prajna.rajendrakumar@microchip.com> --- board/beagleboard/beaglev_fire/patches/linux/linux.hash | 2 +- board/beagleboard/beaglev_fire/patches/uboot/uboot.hash | 2 +- configs/beaglev_fire_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/beagleboard/beaglev_fire/patches/linux/linux.hash b/board/beagleboard/beaglev_fire/patches/linux/linux.hash index 025d630f7d..c18b1d8797 100644 --- a/board/beagleboard/beaglev_fire/patches/linux/linux.hash +++ b/board/beagleboard/beaglev_fire/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a45642bd69b11d9312c15faac67fbd15b0ef90a6d90662d18c0760e37165c7cc linux4microchip+fpga-2024.06.tar.gz +sha256 dcb7b41fd363729675c34545fcb514d5a94dbb3714ee10f527a26ca7716c2579 linux4microchip+fpga-2024.06.tar.gz diff --git a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash index ddb73b9a71..e079229c19 100644 --- a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash +++ b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5d9bcbebe9723ab12cbf2b60277268741e84e4aadbe7ecd8c05be046f202d8a1 linux4microchip+fpga-2024.06.tar.gz +sha256 d461c45a9c5acd019776cdcf8ab2b571315282a880dd6580431f7dd5bfac3889 linux4microchip+fpga-2024.06.tar.gz diff --git a/configs/beaglev_fire_defconfig b/configs/beaglev_fire_defconfig index 809e00ff92..93b6aa7f26 100644 --- a/configs/beaglev_fire_defconfig +++ b/configs/beaglev_fire_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_OVERLAY="board/beagleboard/beaglev_fire/rootfs-overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboard/beaglev_fire/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.6-mchp+fpga)/linux4microchip+fpga-2024.06.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux4microchip+fpga-2024.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire" @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,u-boot-2023.07-mchp)/linux4microchip+fpga-2024.06.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/linux4microchip+fpga-2024.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beaglev_fire" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beagleboard/beaglev_fire/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2 1/2] fix: configs/beaglev_fire: update custom tarballs 2024-08-08 10:52 ` [Buildroot] [PATCH v2 1/2] fix: configs/beaglev_fire: update " Jamie Gibbons via buildroot @ 2024-08-08 20:06 ` Thomas Petazzoni via buildroot 0 siblings, 0 replies; 4+ messages in thread From: Thomas Petazzoni via buildroot @ 2024-08-08 20:06 UTC (permalink / raw) To: Jamie Gibbons via buildroot; +Cc: Jamie Gibbons, Prajna Rajendra Kumar Hello Jamie, I was about to apply but had some second thoughts. See below. First, please don't add this "fix: " at the beginning of the commit title. The commit title should be just: configs/beaglev_fire: update custom tarballs On Thu, 8 Aug 2024 11:52:20 +0100 Jamie Gibbons via buildroot <buildroot@buildroot.org> wrote: > The Linux kernel and U-Boot custom tarballs were updated incorrectly. Please change to "were updated incorrectly in commit 8ce97fd550d6". > Update these to select specific release tags instead of branches. Update > the U-Boot hash to match changes. Why do you mention that update the U-Boot hash here, while the Linux hash is also updated? > > Fixes:8ce97fd550d6("configs/beaglev_fire: bump Linux and U-Boot") Space after "Fixes:", space after the commit hash. But now, the real issue (because I had already fixed locally the above minor details). > index 809e00ff92..93b6aa7f26 100644 > --- a/configs/beaglev_fire_defconfig > +++ b/configs/beaglev_fire_defconfig > @@ -8,7 +8,7 @@ BR2_ROOTFS_OVERLAY="board/beagleboard/beaglev_fire/rootfs-overlay/" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboard/beaglev_fire/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.6-mchp+fpga)/linux4microchip+fpga-2024.06.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux4microchip+fpga-2024.06.tar.gz" Please change the name of the tarball to linux-linux4microchip+fpga-2024.06.tar.gz, i.e this line should be: BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux-linux4microchip+fpga-2024.06.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="mpfs" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire" > @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,u-boot-2023.07-mchp)/linux4microchip+fpga-2024.06.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/linux4microchip+fpga-2024.06.tar.gz" Please change the name of the tarball to uboot-linux4microchip+fpga-2024.06.tar.gz, so this line should become: BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/uboot-linux4microchip+fpga-2024.06.tar.gz" The motivation for this is that otherwise we have two tarballs with exactly the same name "linux4microchip+fpga-2024.06.tar.gz", for Linux and U-Boot, which can be confusing. Also, it is customary in Buildroot to name tarballe <package>-<version>.tar.gz, which is exactly what I'm asking you to do here. (I could have fixed that myself, but I'm working on a not very fast DSL connection at the moment, so downloading all those kernel tarballs takes quite a while...) Could you take into account those comments also for PATCH 2/2 ? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 2/2] fix: configs/microchip_mpfs_icicle: update custom tarballs 2024-08-08 10:52 [Buildroot] [PATCH v2 0/2] fix mpfs custom tarballs Jamie Gibbons via buildroot 2024-08-08 10:52 ` [Buildroot] [PATCH v2 1/2] fix: configs/beaglev_fire: update " Jamie Gibbons via buildroot @ 2024-08-08 10:52 ` Jamie Gibbons via buildroot 1 sibling, 0 replies; 4+ messages in thread From: Jamie Gibbons via buildroot @ 2024-08-08 10:52 UTC (permalink / raw) To: buildroot; +Cc: Jamie Gibbons, Prajna Rajendra Kumar, Thomas Petazzoni The Linux kernel and U-Boot custom tarballs were updated incorrectly. Update these to select specific release tags instead of branches. Update the U-Boot hash to match changes. Fixes:45db64545742("configs/microchip_mpfs_icicle: bump Linux and U-Boot, add hashes") Signed-off-by: Jamie Gibbons <jamie.gibbons@microchip.com> Tested-by: Prajna Rajendra Kumar <prajna.rajendrakumar@microchip.com> --- board/microchip/mpfs_icicle/patches/linux/linux.hash | 2 +- board/microchip/mpfs_icicle/patches/uboot/uboot.hash | 2 +- configs/microchip_mpfs_icicle_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/microchip/mpfs_icicle/patches/linux/linux.hash b/board/microchip/mpfs_icicle/patches/linux/linux.hash index 025d630f7d..c18b1d8797 100644 --- a/board/microchip/mpfs_icicle/patches/linux/linux.hash +++ b/board/microchip/mpfs_icicle/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a45642bd69b11d9312c15faac67fbd15b0ef90a6d90662d18c0760e37165c7cc linux4microchip+fpga-2024.06.tar.gz +sha256 dcb7b41fd363729675c34545fcb514d5a94dbb3714ee10f527a26ca7716c2579 linux4microchip+fpga-2024.06.tar.gz diff --git a/board/microchip/mpfs_icicle/patches/uboot/uboot.hash b/board/microchip/mpfs_icicle/patches/uboot/uboot.hash index ddb73b9a71..e079229c19 100644 --- a/board/microchip/mpfs_icicle/patches/uboot/uboot.hash +++ b/board/microchip/mpfs_icicle/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5d9bcbebe9723ab12cbf2b60277268741e84e4aadbe7ecd8c05be046f202d8a1 linux4microchip+fpga-2024.06.tar.gz +sha256 d461c45a9c5acd019776cdcf8ab2b571315282a880dd6580431f7dd5bfac3889 linux4microchip+fpga-2024.06.tar.gz diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig index 30d07550ac..e6a94f091f 100644 --- a/configs/microchip_mpfs_icicle_defconfig +++ b/configs/microchip_mpfs_icicle_defconfig @@ -7,7 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="mpfs_icicle" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/microchip/mpfs_icicle/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.6-mchp+fpga)/linux4microchip+fpga-2024.06.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux4microchip+fpga-2024.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,u-boot-2023.07-mchp)/linux4microchip+fpga-2024.06.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/linux4microchip+fpga-2024.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="microchip_mpfs_icicle" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/uboot-fragment-rootfs.config" BR2_TARGET_UBOOT_NEEDS_DTC=y -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-08 20:06 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-08-08 10:52 [Buildroot] [PATCH v2 0/2] fix mpfs custom tarballs Jamie Gibbons via buildroot 2024-08-08 10:52 ` [Buildroot] [PATCH v2 1/2] fix: configs/beaglev_fire: update " Jamie Gibbons via buildroot 2024-08-08 20:06 ` Thomas Petazzoni via buildroot 2024-08-08 10:52 ` [Buildroot] [PATCH v2 2/2] fix: configs/microchip_mpfs_icicle: " Jamie Gibbons via buildroot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox