Commit df784824 authored by Ritesh Raj Sarraf's avatar Ritesh Raj Sarraf Committed by Ritesh Raj Sarraf
Browse files

Import Debian version 5.14um1

parent ebe7a7ff
Pipeline #319174 canceled with stages
in 37 seconds
This diff is collapsed.
This diff is collapsed.
user-mode-linux (5.14um1) unstable; urgency=medium
* [ea5aed5] Prepare for 5.14 Linux update
* [a3ad117] Drop patches. May not be relevant any more
* [5911d78] Update Linux configs to 5.14 (Closes: #995263)
-- Ritesh Raj Sarraf <rrs@debian.org> Fri, 08 Oct 2021 21:25:11 +0530
user-mode-linux (5.10um3) unstable; urgency=medium
* [95d05ef] Drop patch um_mark_all_kernel_symbols_as_local.patch
(Closes: #989665)
* [bf8d469] Update UML Linux configs
-- Ritesh Raj Sarraf <rrs@debian.org> Fri, 11 Jun 2021 11:43:23 +0530
user-mode-linux (5.10um2) unstable; urgency=medium
[ Christopher Obbard ]
* [d9ca0da] debian/watch: Track Debian Linux package
[ Ritesh Raj Sarraf ]
* [f768bbd] Makr all kernel symbols as local (Closes: #983379)
* [050050b] Refresh patches
* [110f0b2] Enable kernel debug info
-- Ritesh Raj Sarraf <rrs@debian.org> Sun, 07 Mar 2021 10:01:29 +0530
user-mode-linux (5.10um1) unstable; urgency=medium
[ Debian Janitor ]
* [4b95d20] Trim trailing whitespace.
[ Ritesh Raj Sarraf ]
* [96b5aeb] Prepare for Linux 5.10
* [1f00328] Update UML configs for Linux 5.10
* [7177cae] Set priority to optional
* [235490c] Rename d/NEWS.Debian to d/NEWS
-- Ritesh Raj Sarraf <rrs@debian.org> Sat, 09 Jan 2021 20:56:48 +0530
user-mode-linux (5.9um1) unstable; urgency=medium
* [016b157] Prepare for Linux 5.9
......
Source: user-mode-linux
Section: kernel
Priority: extra
Priority: optional
Maintainer: User Mode Linux Maintainers <team+uml@tracker.debian.org>
Build-Depends: debhelper (>> 12.0.0), quilt, linux-source-5.9, docbook-to-man, xz-utils, m4, kmod, libvdeplug-dev | libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2), libssl-dev, bison, flex, gcc-multilib
Build-Depends: debhelper (>> 12.0.0), quilt, linux-source-5.14, docbook-to-man, xz-utils, m4, kmod, libvdeplug-dev | libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2), libssl-dev, bison, flex, gcc-multilib
Uploaders: Ritesh Raj Sarraf <rrs@debian.org>
Standards-Version: 4.4.1
Rules-Requires-Root: no
......
# Mattia Dongili <malattia@debian.org>
# Matt Zimmermannn <mdz@debian.org>
# Use Debian's x-terminal-emulator
Index: linux-source-3.2/arch/um/drivers/xterm.c
===================================================================
--- linux-source-3.2.orig/arch/um/drivers/xterm.c 2013-01-04 07:21:26.429470247 +0900
+++ linux-source-3.2/arch/um/drivers/xterm.c 2013-01-04 07:21:30.921419619 +0900
@@ -40,7 +40,7 @@
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -42,7 +42,7 @@
}
/* Only changed by xterm_setup, which is a setup */
......@@ -14,7 +12,7 @@ Index: linux-source-3.2/arch/um/drivers/xterm.c
static char *title_switch = "-T";
static char *exec_switch = "-e";
@@ -77,7 +77,7 @@
@@ -79,7 +79,7 @@
" respectively. The title switch must have the form '<switch> title',\n"
" not '<switch>=title'. Similarly, the exec switch must have the form\n"
" '<switch> command arg1 arg2 ...'.\n"
......
# Mattia Dongili <malattia@debian.org>
# Matt Zimmermannn <mdz@debian.org>
# Use Debian's standard location for uml_net helper
--- a/arch/um/drivers/daemon_kern.c 2008-02-03 15:09:48.497911268 +0900
+++ b/arch/um/drivers/daemon_kern.c 2008-02-03 15:13:05.546916771 +0900
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -65,7 +65,7 @@
*init = ((struct daemon_init)
......
--- a/arch/x86/um/Makefile
+++ b/arch/x86/um/Makefile
@@ -21,7 +21,7 @@
obj-$(CONFIG_ELF_CORE) += elfcore.o
subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
-subarch-y += ../kernel/sys_ia32.o
+subarch-y += ../kernel/sys_ia32.o ../lib/atomic64_386_32.o ../lib/cmpxchg8b_emu.o
else
commit 17e10328a8bcbdaae372ae333e0a057ece8bc256
Author: Mattia Dongili <malattia@linux.it>
Date: Fri Apr 6 07:18:17 2012 +0900
uml: Remove unnecessary RPATH definition
Signed-off-by: Mattia Dongili <malattia@linux.it>
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -119,7 +119,6 @@
$(Q)$(MAKE) $(build)=$(HOST_DIR)/um include/generated/user_constants.h
LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)
CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \
$(call cc-option, -fno-stack-protector,) \
--- a/arch/x86/Makefile.um
+++ b/arch/x86/Makefile.um
@@ -42,9 +42,6 @@
ELF_ARCH := i386:x86-64
ELF_FORMAT := elf64-x86-64
-# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
-
-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
LINK-y += -m64
endif
PCAP and VDE network transports require linking with userspace
libraries. The current build system has no means of passing these
as arguments.
This patch adds a script to expand the library list for linking
for these transports as well as any future driver that needs to
rely on additional libraries on the userspace side.
Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
---
arch/um/scripts/extra-libs.sh | 10 ++++++++++
scripts/link-vmlinux.sh | 4 +++-
2 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 arch/um/scripts/extra-libs.sh
--- /dev/null
+++ b/arch/um/scripts/extra-libs.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# This file should be included from link-vmlinux, not executed!!!
+
+if [ "${CONFIG_UML_NET_VDE}" = "y" ] ; then
+ UML_EXTRA_LIBS="$UML_EXTRA_LIBS -lvdeplug"
+fi
+if [ "${CONFIG_UML_NET_PCAP}" = "y" ] ; then
+ UML_EXTRA_LIBS="$UML_EXTRA_LIBS -lpcap"
+fi
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -97,12 +97,14 @@
-Wl,--end-group \
${@}"
+ . arch/um/scripts/extra-libs.sh
+
${CC} ${CFLAGS_vmlinux} \
${strip_debug} \
-o ${output} \
-Wl,-T,${lds} \
${objects} \
- -lutil -lrt -lpthread
+ -lutil -lrt -lpthread ${UML_EXTRA_LIBS}
rm -f linux
fi
}
02_x-terminal-emulator.patch
03_uml_switch.patch
05_fix_static_build.patch
06-fix-linkage-on-386-arch.patch
07-remove-rpath.patch
08-fix-pcap-linkage.patch
......@@ -6,7 +6,7 @@
#export DH_VERBOSE=1
config_target:=oldconfig
kernel_version:=5.9
kernel_version:=5.14
kernel_src:=linux-source-$(kernel_version)
BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W linux-source-$(kernel_version))
debian:=$(CURDIR)/debian
......@@ -46,7 +46,7 @@ menuconfig: unpack copy-config
cp config.$(DEB_HOST_ARCH) config.$(DEB_HOST_ARCH).menuconfig.old
cp $(kernel_src)/.config config.$(DEB_HOST_ARCH)
#
#
# end development only targets
......
version=4
opts="dversionmangle=s/um(\d+)$//,uversionmangle=s/-(\d+)$//" \
https://salsa.debian.org/kernel-team/linux/tags?sort=updated_desc archive/debian/@ANY_VERSION@/linux-debian-\d\S*@ARCHIVE_EXT@
Supports Markdown
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