[DistroKit] [PATCH 1/2] x86_64: use generic 'series' file for kernel patches

[DistroKit] [PATCH 1/2] x86_64: use generic 'series' file for kernel patches

[Roland Hieber]

The x86_64 kernel fails to extract since the patches were added in
commit 618ef295907a, as there is now a linux patch folder, but no file
named 'series.x86_64' in it. Use the same series file as all other
platforms to get rid of this error.

Fixes: 618ef295907a847425c9 (2023-07-25, "linux-6.4: backport regression patches")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-x86_64/platformconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/platform-x86_64/platformconfig b/configs/platform-x86_64/platformconfig
index 032f5a176cf4..f0405736ad4b 100644
--- a/configs/platform-x86_64/platformconfig
+++ b/configs/platform-x86_64/platformconfig
@@ -151,7 +151,7 @@ PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 #
 # patching & configuration      
 #
-PTXCONF_KERNEL_SERIES="series${PTXDIST_PLATFORMSUFFIX}"
+PTXCONF_KERNEL_SERIES="series"
 PTXCONF_KERNEL_CONFIG="kernelconfig"
 # end of patching & configuration      
 
-- 
2.39.2

[DistroKit] [PATCH 2/2] configs: remove outdated collectionconfigs

[Roland Hieber]

These files were last touched in 2013 (10 years ago), and there is
currently no package that can be selected in a collectionconfig anyway –
the last ones were removed in commit cb563ef79200116c0101 (2016-06-09,
Robert Schwebel: "ptxconfig: reduce active components").

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/collectionconfig.full    | 18 ------------------
 configs/collectionconfig.minimum | 11 -----------
 2 files changed, 29 deletions(-)
 delete mode 100644 configs/collectionconfig.full
 delete mode 100644 configs/collectionconfig.minimum

diff --git a/configs/collectionconfig.full b/configs/collectionconfig.full
deleted file mode 100644
index d533425e134b..000000000000
--- a/configs/collectionconfig.full
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# PTXdist 2013.05.0
-#
-PTXCONF__collectionconfig_MAGIC__=y
-# PTXCONF_COLLECTION_NONE is not set
-PTXCONF_COLLECTION_MANUAL=y
-# PTXCONF_COLLECTION_ALL is not set
-PTXCONF_ATTR=y
-PTXCONF_E2FSPROGS=y
-PTXCONF_GDBSERVER=y
-PTXCONF_HTOP=y
-PTXCONF_LESS=y
-PTXCONF_LIGHTTPD=y
-PTXCONF_SCREEN=y
-PTXCONF_SQLITE=y
-PTXCONF_STRACE=y
-PTXCONF_URSHD=y
diff --git a/configs/collectionconfig.minimum b/configs/collectionconfig.minimum
deleted file mode 100644
index 9b5c370e0f18..000000000000
--- a/configs/collectionconfig.minimum
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# PTXdist 2013.05.0
-#
-PTXCONF__collectionconfig_MAGIC__=y
-PTXCONF_COLLECTION_NONE=y
-# PTXCONF_COLLECTION_MANUAL is not set
-# PTXCONF_COLLECTION_ALL is not set
-# PTXCONF_LIGHTTPD is not set
-# PTXCONF_SQLITE is not set
-# PTXCONF_URSHD is not set
-- 
2.39.2

Re: [DistroKit] [PATCH 1/2] x86_64: use generic 'series' file for kernel patches

[Robert Schwebel]

On Sun, Aug 13, 2023 at 08:57:32PM +0200, Roland Hieber wrote:
> The x86_64 kernel fails to extract since the patches were added in
> commit 618ef295907a, as there is now a linux patch folder, but no file
> named 'series.x86_64' in it. Use the same series file as all other
> platforms to get rid of this error.
> 
> Fixes: 618ef295907a847425c9 (2023-07-25, "linux-6.4: backport regression patches")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-x86_64/platformconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/platform-x86_64/platformconfig b/configs/platform-x86_64/platformconfig
> index 032f5a176cf4..f0405736ad4b 100644
> --- a/configs/platform-x86_64/platformconfig
> +++ b/configs/platform-x86_64/platformconfig
> @@ -151,7 +151,7 @@ PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
>  #
>  # patching & configuration      
>  #
> -PTXCONF_KERNEL_SERIES="series${PTXDIST_PLATFORMSUFFIX}"
> +PTXCONF_KERNEL_SERIES="series"
>  PTXCONF_KERNEL_CONFIG="kernelconfig"
>  # end of patching & configuration      

Ah, I made a similar patch before coming to your patch. Already fixed :)

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

Re: [DistroKit] [PATCH 2/2] configs: remove outdated collectionconfigs

[Robert Schwebel]

Applied to next.

On Sun, Aug 13, 2023 at 08:57:33PM +0200, Roland Hieber wrote:
> These files were last touched in 2013 (10 years ago), and there is
> currently no package that can be selected in a collectionconfig anyway –
> the last ones were removed in commit cb563ef79200116c0101 (2016-06-09,
> Robert Schwebel: "ptxconfig: reduce active components").
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/collectionconfig.full    | 18 ------------------
>  configs/collectionconfig.minimum | 11 -----------
>  2 files changed, 29 deletions(-)
>  delete mode 100644 configs/collectionconfig.full
>  delete mode 100644 configs/collectionconfig.minimum
> 
> diff --git a/configs/collectionconfig.full b/configs/collectionconfig.full
> deleted file mode 100644
> index d533425e134b..000000000000
> --- a/configs/collectionconfig.full
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -#
> -# Automatically generated file; DO NOT EDIT.
> -# PTXdist 2013.05.0
> -#
> -PTXCONF__collectionconfig_MAGIC__=y
> -# PTXCONF_COLLECTION_NONE is not set
> -PTXCONF_COLLECTION_MANUAL=y
> -# PTXCONF_COLLECTION_ALL is not set
> -PTXCONF_ATTR=y
> -PTXCONF_E2FSPROGS=y
> -PTXCONF_GDBSERVER=y
> -PTXCONF_HTOP=y
> -PTXCONF_LESS=y
> -PTXCONF_LIGHTTPD=y
> -PTXCONF_SCREEN=y
> -PTXCONF_SQLITE=y
> -PTXCONF_STRACE=y
> -PTXCONF_URSHD=y
> diff --git a/configs/collectionconfig.minimum b/configs/collectionconfig.minimum
> deleted file mode 100644
> index 9b5c370e0f18..000000000000
> --- a/configs/collectionconfig.minimum
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#
> -# Automatically generated file; DO NOT EDIT.
> -# PTXdist 2013.05.0
> -#
> -PTXCONF__collectionconfig_MAGIC__=y
> -PTXCONF_COLLECTION_NONE=y
> -# PTXCONF_COLLECTION_MANUAL is not set
> -# PTXCONF_COLLECTION_ALL is not set
> -# PTXCONF_LIGHTTPD is not set
> -# PTXCONF_SQLITE is not set
> -# PTXCONF_URSHD is not set
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |