Skip to content

GitLab

L
linux
Commit 44efe5e4 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated kernel 5.2.8

parent f45e2562
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59523 additions and 26899 deletions
Makefile
View file @ 44efe5e4
This diff is collapsed.
build.xml
View file @ 44efe5e4
<project name="linux">
<target name="cross-linuxheaders">
<property name="makedir" value="${builddir}/linux-4.14.36"/>
<property name="makedir" value="${builddir}/linux-5.2.8"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/linux/linux-4.14.36.tar.xz -C ${builddir}"/>
<arg line="xf packages/linux/linux-5.2.8.tar.xz -C ${builddir}"/>
</exec>
<exec executable="make" dir="${makedir}" failonerror="true">
<arg line="mrproper"/>
......@@ -30,13 +30,10 @@
</target>
<target name="boot-linux-armv7">
<property name="makedir" value="${builddir}/linux-4.14.36"/>
<property name="makedir" value="${builddir}/linux-5.2.8"/>
<mkdir dir="${makedir}"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/linux/linux-4.14.36.tar.xz -C ${builddir}"/>
</exec>
<exec executable="patch" dir="${makedir}" failonerror="true">
<arg line="-Np1 -i ${basedir}/packages/linux/linux-4.14.36-gcc8.patch"/>
<arg line="xf packages/linux/linux-5.2.8.tar.xz -C ${builddir}"/>
</exec>
<exec executable="make" dir="${makedir}" failonerror="true">
<env key="PATH" path="${PATH}"/>
......@@ -94,29 +91,29 @@ CONFIG_CROSS_COMPILE="${CLFS_TARGET}"
<arg line="-pv ${sysrootdir}/tools/boot"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v arch/${ARCH}/boot/zImage ${sysrootdir}/tools/boot/vmlinuz-clfs-4.14.36"/>
<arg line="-v arch/${ARCH}/boot/zImage ${sysrootdir}/tools/boot/vmlinuz-clfs-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v System.map ${sysrootdir}/tools/boot/System.map-4.14.36"/>
<arg line="-v System.map ${sysrootdir}/tools/boot/System.map-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v .config ${sysrootdir}/tools/boot/config-4.14.36"/>
<arg line="-v .config ${sysrootdir}/tools/boot/config-5.2.8"/>
</exec>
<mkdir dir="${builddir}/boot"/>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v arch/${ARCH}/boot/zImage ${builddir}/boot/vmlinuz-clfs-4.14.36"/>
<arg line="-v arch/${ARCH}/boot/zImage ${builddir}/boot/vmlinuz-clfs-5.2.8"/>
</exec>
<exec executable="ln" dir="${makedir}" failonerror="true">
<arg line="-s vmlinuz-clfs-4.14.36 ${builddir}/boot/vmlinuz"/>
<arg line="-s vmlinuz-clfs-5.2.8 ${builddir}/boot/vmlinuz"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v System.map ${builddir}/boot/System.map-4.14.36"/>
<arg line="-v System.map ${builddir}/boot/System.map-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v .config ${builddir}/boot/config-4.14.36"/>
<arg line="-v .config ${builddir}/boot/config-5.2.8"/>
</exec>
<exec executable="ln" dir="${makedir}" failonerror="true">
<arg line="-s config-4.14.36 ${builddir}/boot/config"/>
<arg line="-s config-5.2.8 ${builddir}/boot/config"/>
</exec>
<delete dir="${makedir}"/>
</target>
......@@ -126,13 +123,10 @@ CONFIG_CROSS_COMPILE="${CLFS_TARGET}"
</target>
<target name="boot-linux-armv8">
<property name="makedir" value="${builddir}/linux-4.14.36"/>
<property name="makedir" value="${builddir}/linux-5.2.8"/>
<mkdir dir="${makedir}"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/linux/linux-4.14.36.tar.xz -C ${builddir}"/>
</exec>
<exec executable="patch" dir="${makedir}" failonerror="true">
<arg line="-Np1 -i ${basedir}/packages/linux/linux-4.14.36-gcc8.patch"/>
<arg line="xf packages/linux/linux-5.2.8.tar.xz -C ${builddir}"/>
</exec>
<exec executable="make" dir="${makedir}" failonerror="true">
<env key="PATH" path="${PATH}"/>
......@@ -190,29 +184,29 @@ CONFIG_CROSS_COMPILE="${CLFS_TARGET}"
<arg line="-pv ${sysrootdir}/tools/boot"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v arch/${ARCH}/boot/Image.gz ${sysrootdir}/tools/boot/vmlinuz-clfs-4.14.36"/>
<arg line="-v arch/${ARCH}/boot/Image.gz ${sysrootdir}/tools/boot/vmlinuz-clfs-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v System.map ${sysrootdir}/tools/boot/System.map-4.14.36"/>
<arg line="-v System.map ${sysrootdir}/tools/boot/System.map-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v .config ${sysrootdir}/tools/boot/config-4.14.36"/>
<arg line="-v .config ${sysrootdir}/tools/boot/config-5.2.8"/>
</exec>
<mkdir dir="${builddir}/boot"/>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v arch/${ARCH}/boot/Image.gz ${builddir}/boot/vmlinuz-clfs-4.14.36"/>
<arg line="-v arch/${ARCH}/boot/Image.gz ${builddir}/boot/vmlinuz-clfs-5.2.8"/>
</exec>
<exec executable="ln" dir="${makedir}" failonerror="true">
<arg line="-s vmlinuz-clfs-4.14.36 ${builddir}/boot/vmlinuz"/>
<arg line="-s vmlinuz-clfs-5.2.8 ${builddir}/boot/vmlinuz"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v System.map ${builddir}/boot/System.map-4.14.36"/>
<arg line="-v System.map ${builddir}/boot/System.map-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v .config ${builddir}/boot/config-4.14.36"/>
<arg line="-v .config ${builddir}/boot/config-5.2.8"/>
</exec>
<exec executable="ln" dir="${makedir}" failonerror="true">
<arg line="-s config-4.14.36 ${builddir}/boot/config"/>
<arg line="-s config-5.2.8 ${builddir}/boot/config"/>
</exec>
<delete dir="${makedir}"/>
</target>
......@@ -221,6 +215,10 @@ CONFIG_CROSS_COMPILE="${CLFS_TARGET}"
<ant antfile="packages/linux/build.xml" target="boot-linux-x86_64"/>
</target>
<target name="boot-linux-qemu-phenom">
<ant antfile="packages/linux/build.xml" target="boot-linux-x86_64"/>
</target>
<target name="boot-linux-qemu-core2duo">
<ant antfile="packages/linux/build.xml" target="boot-linux-x86_64"/>
</target>
......@@ -290,13 +288,10 @@ CONFIG_CROSS_COMPILE="${CLFS_TARGET}"
</target>
<target name="boot-linux-x86_64">
<property name="makedir" value="${builddir}/linux-4.14.36"/>
<property name="makedir" value="${builddir}/linux-5.2.8"/>
<mkdir dir="${makedir}"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/linux/linux-4.14.36.tar.xz -C ${builddir}"/>
</exec>
<exec executable="patch" dir="${makedir}" failonerror="true">
<arg line="-Np1 -i ${basedir}/packages/linux/linux-4.14.36-gcc8.patch"/>
<arg line="xf packages/linux/linux-5.2.8.tar.xz -C ${builddir}"/>
</exec>
<exec executable="make" dir="${makedir}" failonerror="true">
<env key="PATH" path="${PATH}"/>
......@@ -354,29 +349,29 @@ CONFIG_CROSS_COMPILE="${CLFS_TARGET}"
<arg line="-pv ${sysrootdir}/tools/boot"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v arch/${ARCH}/boot/bzImage ${sysrootdir}/tools/boot/vmlinuz-clfs-4.14.36"/>
<arg line="-v arch/${ARCH}/boot/bzImage ${sysrootdir}/tools/boot/vmlinuz-clfs-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v System.map ${sysrootdir}/tools/boot/System.map-4.14.36"/>
<arg line="-v System.map ${sysrootdir}/tools/boot/System.map-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v .config ${sysrootdir}/tools/boot/config-4.14.36"/>
<arg line="-v .config ${sysrootdir}/tools/boot/config-5.2.8"/>
</exec>
<mkdir dir="${builddir}/boot"/>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v arch/${ARCH}/boot/bzImage ${builddir}/boot/vmlinuz-clfs-4.14.36"/>
<arg line="-v arch/${ARCH}/boot/bzImage ${builddir}/boot/vmlinuz-clfs-5.2.8"/>
</exec>
<exec executable="ln" dir="${makedir}" failonerror="true">
<arg line="-s vmlinuz-clfs-4.14.36 ${builddir}/boot/vmlinuz"/>
<arg line="-s vmlinuz-clfs-5.2.8 ${builddir}/boot/vmlinuz"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v System.map ${builddir}/boot/System.map-4.14.36"/>
<arg line="-v System.map ${builddir}/boot/System.map-5.2.8"/>
</exec>
<exec executable="cp" dir="${makedir}" failonerror="true">
<arg line="-v .config ${builddir}/boot/config-4.14.36"/>
<arg line="-v .config ${builddir}/boot/config-5.2.8"/>
</exec>
<exec executable="ln" dir="${makedir}" failonerror="true">
<arg line="-s config-4.14.36 ${builddir}/boot/config"/>
<arg line="-s config-5.2.8 ${builddir}/boot/config"/>
</exec>
<delete dir="${makedir}"/>
</target>
......
linux-4.14.36-gcc8.patch deleted 100644 → 0
View file @ f45e2562
diff --git a/tools/lib/subcmd/pager.c b/tools/lib/subcmd/pager.c
index 5ba754d17952..9997a8805a82 100644
--- a/tools/lib/subcmd/pager.c
+++ b/tools/lib/subcmd/pager.c
@@ -30,10 +30,13 @@ static void pager_preexec(void)
* have real input
*/
fd_set in;
+ fd_set exception;
FD_ZERO(&in);
+ FD_ZERO(&exception);
FD_SET(0, &in);
- select(1, &in, NULL, &in, NULL);
+ FD_SET(0, &exception);
+ select(1, &in, NULL, &exception, NULL);
setenv("LESS", "FRSX", 0);
}
diff --git a/tools/lib/str_error_r.c b/tools/lib/str_error_r.c
index d6d65537b0d9..11c3425f272b 100644
--- a/tools/lib/str_error_r.c
+++ b/tools/lib/str_error_r.c
@@ -21,7 +21,12 @@
char *str_error_r(int errnum, char *buf, size_t buflen)
{
int err = strerror_r(errnum, buf, buflen);
- if (err)
- snprintf(buf, buflen, "INTERNAL ERROR: strerror_r(%d, %p, %zd)=%d", errnum, buf, buflen, err);
+ if (err) {
+ char *err_buf = buf;
+
+ snprintf(err_buf, buflen,
+ "INTERNAL ERROR: strerror_r(%d, %p, %zd)=%d",
+ errnum, buf, buflen, err);
+ }
return buf;
}
linux-4.14.36-orangepi.patch deleted 100644 → 0
View file @ f45e2562
This diff is collapsed.
linux-5.2.8-orangepi.patch 0 → 100644
View file @ 44efe5e4
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment