diff options
| author | Thomas Trepl <thomas@linuxfromscratch.org> | 2020-08-25 06:50:08 +0000 |
|---|---|---|
| committer | Thomas Trepl <thomas@linuxfromscratch.org> | 2020-08-25 06:50:08 +0000 |
| commit | 7091d5910e287da89a066cb95e36783d0d0590fb (patch) | |
| tree | 081217b110bbd8255f90723595e24fb87f25c8aa | |
| parent | a1ad5224f32801b3c76bac2ad3b63702e99c6f69 (diff) | |
Merge changes from trunk to multilib
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12036 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | general.ent | 6 | ||||
| -rw-r--r-- | packages.ent | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 73d439649..e3630b0f0 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,16 @@ <listitem revision="sysv"> or <listitem revision="systemd"> as appropriate for the entry or if needed the entire day's listitem. --> + <listitem> + <itemizedlist> + <para>2020-08-24</para> + <listitem> + <para>[bdubbs] - Update to linux-5.8.3. Fixes + <ulink url="&lfs-ticket-root;4718">#4718</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + <listitem arch="ml_32,ml_x32,ml_all"> <itemizedlist> <para>2020-08-20</para> diff --git a/general.ent b/general.ent index 0ae26d67b..b712e8952 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20200818"> +<!ENTITY version "SVN-20200824"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; Change to x.y for release but not -rc releases --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> -<!ENTITY versiond "20200818-systemd"> +<!ENTITY versiond "20200824-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "August 18th, 2020"> +<!ENTITY releasedate "August 24th, 2020"> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not – --> diff --git a/packages.ent b/packages.ent index f1eeb0b93..53cc45df8 100644 --- a/packages.ent +++ b/packages.ent @@ -425,12 +425,12 @@ <!ENTITY linux-major-version "5"> <!ENTITY linux-minor-version "8"> -<!ENTITY linux-patch-version "1"> +<!ENTITY linux-patch-version "3"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -<!ENTITY linux-size "111,776 KB"> +<!ENTITY linux-size "111,791 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> -<!ENTITY linux-md5 "ee17763117af02637f9f98bfeee32a09"> +<!ENTITY linux-md5 "2656fe1a0942856c8740468d175e39b6"> <!ENTITY linux-home "https://www.kernel.org/"> <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is allnoconfig extended for a hopefully-bootable build on desktop machine, |