diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2021-11-14 08:24:03 (GMT) |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2021-11-30 06:56:44 (GMT) |
| commit | f441a6bf0dc7031145a1383e8037daf48f7c60ca (patch) | |
| tree | f2ca720c4dbf6c5f5a0c7a27242f5b9b864d7a53 | |
| parent | 4dc9d643f94720bb11a7b4fa0c39729a684be5bb (diff) | |
linux: Add dependency on rsync for Linux >= 5.3
As of Linux v5.3 rsync is used as part of the build process. Add Linux
5.3 as a milestone, configure detection of rsync and a dependency on
rsync for Linux 5.3 and newer. Add a comment in so that users can tell
why they can't select a newer version.
Fixes #1628
Signed-off-by: Chris Packham <judge.packham@gmail.com>
| -rw-r--r-- | config/configure.in.in | 3 | ||||
| -rw-r--r-- | config/kernel/linux.in | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | packages/linux/package.desc | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/config/configure.in.in b/config/configure.in.in index 526064b..a43fb61 100644 --- a/config/configure.in.in +++ b/config/configure.in.in @@ -21,6 +21,9 @@ config CONFIGURE_has_meson config CONFIGURE_has_ninja @KCONFIG_ninja@ +config CONFIGURE_has_rsync + @KCONFIG_rsync@ + config CONFIGURE_has_make_3_81_or_newer @KCONFIG_make_3_81_or_newer@ diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 6ff8192..a6cd40f 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -12,6 +12,13 @@ # (including versions in between) until the EOL dates indicated below. # Such pinned versions are indicated in version.desc files with a comment. +config KERNEL_DEP_RSYNC + def_bool y + select LINUX_REQUIRE_older_than_5_3 if !CONFIGURE_has_rsync + +comment "Linux >=5.3 requires rsync" + depends on !CONFIGURE_has_rsync + choice bool prompt "Kernel verbosity:" diff --git a/configure.ac b/configure.ac index c4964df..8736fe1 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,10 @@ AC_CHECK_PROGS([ninja], [ninja]) CTNG_SET_KCONFIG_OPTION([ninja]) AC_SUBST([ninja]) +AC_CHECK_PROGS([rsync], [rsync]) +CTNG_SET_KCONFIG_OPTION([rsync]) +AC_SUBST([rsync]) + CTNG_CPU_COUNT CTNG_PATH_TOOL_REQ([PATCH], [gpatch patch], [patch]) diff --git a/packages/linux/package.desc b/packages/linux/package.desc index 9763638..f5fa080 100644 --- a/packages/linux/package.desc +++ b/packages/linux/package.desc @@ -2,6 +2,6 @@ origin='www.kernel.org' repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' mirrors='$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})' relevantpattern='2.*.*|. *.*|.' -milestones='3.2 3.7 4.8' +milestones='3.2 3.7 4.8 5.3' archive_formats='.tar.xz .tar.gz' signature_format='unpacked/.sign' |