[elbe-devel] [PATCH] contrib: Drop linux patches
viraj
viraj.shah at linutronix.de
Wed Aug 24 15:41:11 CEST 2022
On 8/22/22 16:38, Bastian Germann wrote:
> Elbe debianize is planned to be removed, so drop the patches that are
> supposed to be used with it. They are outdated anyway.
>
> This has the side effect that we do not need to add their partly missing
> license info.
>
> Signed-off-by: Bastian Germann <bage at linutronix.de>
Reviewed-by: Viraj Shah <viraj.shah at linutronix.de>
> ---
> ...round-broken-installkernel-in-jessie.patch | 168 ------------------
> ...eat-the-debian-directory-as-precious.patch | 50 ------
> docs/testspec.csv | 2 +-
> setup.py | 2 -
> 4 files changed, 1 insertion(+), 221 deletions(-)
> delete mode 100644 contrib/linux/0001-debian-workaround-broken-installkernel-in-jessie.patch
> delete mode 100644 contrib/linux/0002-Treat-the-debian-directory-as-precious.patch
>
> diff --git a/contrib/linux/0001-debian-workaround-broken-installkernel-in-jessie.patch b/contrib/linux/0001-debian-workaround-broken-installkernel-in-jessie.patch
> deleted file mode 100644
> index 0ecc2845ba..0000000000
> --- a/contrib/linux/0001-debian-workaround-broken-installkernel-in-jessie.patch
> +++ /dev/null
> @@ -1,168 +0,0 @@
> -From 32c89a7b87523247067ac2c2bc4ae893532e970c Mon Sep 17 00:00:00 2001
> -From: John Ogness <john.ogness at linutronix.de>
> -Date: Mon, 23 Jan 2017 21:00:44 +0100
> -Subject: [PATCH] debian: workaround broken installkernel in jessie
> -
> -see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812266
> -for details.
> -
> -This adds the installkernel script from debianutils-4.7 to
> -the root directory of the kernelsource and adds a calling
> -hook to the install.sh script of the supported platforms.
> -
> -Signed-off-by: John Ogness <john.ogness at linutronix.de>
> ----
> - arch/arm/boot/install.sh | 1 +
> - arch/arm64/boot/install.sh | 1 +
> - arch/powerpc/boot/install.sh | 1 +
> - arch/x86/boot/install.sh | 1 +
> - elbe_installkernel | 89 ++++++++++++++++++++++++++++++++++++++++++++
> - 5 files changed, 93 insertions(+)
> - create mode 100644 elbe_installkernel
> -
> -diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh
> -index 2a45092..991f065 100644
> ---- a/arch/arm/boot/install.sh
> -+++ b/arch/arm/boot/install.sh
> -@@ -36,6 +36,7 @@ verify "$3"
> -
> - # User may have a custom install script
> - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
> -+if [ -f ../../elbe_installkernel ]; then exec sh ../../elbe_installkernel "$@"; fi
> - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
> -
> - if [ "$(basename $2)" = "zImage" ]; then
> -diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh
> -index d91e1f0..789cd1e 100644
> ---- a/arch/arm64/boot/install.sh
> -+++ b/arch/arm64/boot/install.sh
> -@@ -36,6 +36,7 @@ verify "$3"
> -
> - # User may have a custom install script
> - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
> -+if [ -f ../../elbe_installkernel ]; then exec sh ../../elbe_installkernel "$@"; fi
> - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
> -
> - if [ "$(basename $2)" = "Image.gz" ]; then
> -diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh
> -index b6a256b..472da56 100644
> ---- a/arch/powerpc/boot/install.sh
> -+++ b/arch/powerpc/boot/install.sh
> -@@ -24,6 +24,7 @@ set -e
> - # User may have a custom install script
> -
> - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
> -+if [ -f ../../elbe_installkernel ]; then exec sh ../../elbe_installkernel "$@"; fi
> - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
> -
> - # Default install
> -diff --git a/arch/x86/boot/install.sh b/arch/x86/boot/install.sh
> -index d13ec1c..7c5263b 100644
> ---- a/arch/x86/boot/install.sh
> -+++ b/arch/x86/boot/install.sh
> -@@ -34,6 +34,7 @@ verify "$3"
> - # User may have a custom install script
> -
> - if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
> -+if [ -f ../../elbe_installkernel ]; then exec sh ../../elbe_installkernel "$@"; fi
> - if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
> -
> - # Default install - same as make zlilo
> -diff --git a/elbe_installkernel b/elbe_installkernel
> -new file mode 100644
> -index 0000000..3aef978
> ---- /dev/null
> -+++ b/elbe_installkernel
> -@@ -0,0 +1,89 @@
> -+#!/bin/sh
> -+#
> -+# Copyright (C) 1995 - 1998, Ian A. Murdock <imurdock at debian.org>
> -+# Copyright (C) 1998, 1999, Guy Maor
> -+# Copyright (C) 2002, Matthew Wilcox
> -+# Copyright (C) 2002, 2004, 2005, 2007, 2009 Clint Adams
> -+# Copyright (C) 2009 Manoj Srivasta
> -+#
> -+# Install the kernel on a Debian Linux system.
> -+#
> -+# This script is called from /usr/src/linux/arch/i386/boot/install.sh.
> -+# If you install it as /sbin/installkernel, you can do a "make install"
> -+# from a generic kernel source tree, and the image will be installed to
> -+# the proper place for Debian GNU/Linux.
> -+
> -+set -e
> -+
> -+# Parse the command line options. Of course, powerpc has to be all
> -+# different, and passes in a fifth argument, just because it is
> -+# "special". We ignore the fifth argument, and do not flag is as an
> -+# error, which it would be for any arch apart from powerpc
> -+if [ $# -eq 3 ] || [ $# -eq 4 ] || [ $# -eq 5 ] ; then
> -+ img="$2"
> -+ map="$3"
> -+ ver="$1"
> -+ if [ $# -ge 4 ] && [ -n "$4" ] ; then
> -+ dir="$4"
> -+ else
> -+ dir="/boot"
> -+ fi
> -+else
> -+ echo "Usage: installkernel <version> <image> <System.map> <directory>"
> -+ exit 1
> -+fi
> -+
> -+# Create backups of older versions before installing
> -+updatever () {
> -+ if [ -f "$dir/$1-$ver" ] ; then
> -+ mv "$dir/$1-$ver" "$dir/$1-$ver.old"
> -+ fi
> -+
> -+ cat "$2" > "$dir/$1-$ver"
> -+
> -+ # This section is for backwards compatibility only
> -+ if test -f "$dir/$1" ; then
> -+ # The presence of "$dir/$1" is unusual in modern intallations, and
> -+ # the results are mostly unused. So only recreate them if they
> -+ # already existed.
> -+ if test -L "$dir/$1" ; then
> -+ # If we were using links, continue to use links, updating if
> -+ # we need to.
> -+ if [ "$(readlink -f ${dir}/${1})" = "${dir}/${1}-${ver}" ]; then
> -+ # Yup, we need to change
> -+ ln -sf "$1-$ver.old" "$dir/$1.old"
> -+ else
> -+ mv "$dir/$1" "$dir/$1.old"
> -+ fi
> -+ ln -sf "$1-$ver" "$dir/$1"
> -+ else # No links
> -+ mv "$dir/$1" "$dir/$1.old"
> -+ cat "$2" > "$dir/$1"
> -+ fi
> -+ fi
> -+}
> -+
> -+if [ "$(basename $img)" = "vmlinux" -o "$(basename $img)" = "Image" ] ; then
> -+ img_dest=vmlinux
> -+else
> -+ img_dest=vmlinuz
> -+fi
> -+updatever $img_dest "$img"
> -+updatever System.map "$map"
> -+
> -+config=$(dirname "$map")
> -+config="${config}/.config"
> -+if [ -f "$config" ] ; then
> -+ updatever config "$config"
> -+fi
> -+
> -+# If installing in the usual directory, run the same scripts that hook
> -+# into kernel package installation. Also make sure the PATH includes
> -+# /usr/sbin and /sbin, just as dpkg would.
> -+if [ "$dir" = "/boot" ]; then
> -+ PATH="$PATH:/usr/sbin:/sbin" \
> -+ run-parts --verbose --exit-on-error --arg="$ver" --arg="$dir/$img_dest-$ver" \
> -+ /etc/kernel/postinst.d
> -+fi
> -+
> -+exit 0
> ---
> -2.1.4
> -
> diff --git a/contrib/linux/0002-Treat-the-debian-directory-as-precious.patch b/contrib/linux/0002-Treat-the-debian-directory-as-precious.patch
> deleted file mode 100644
> index 4a0557068b..0000000000
> --- a/contrib/linux/0002-Treat-the-debian-directory-as-precious.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From 96d12e7753bb39062f5ce530d2daf375a4458f3f Mon Sep 17 00:00:00 2001
> -From: Richard Cochran <rcochran at linutronix.de>
> -Date: Tue, 29 Nov 2016 14:02:56 +0100
> -Subject: [PATCH] Treat the debian directory as precious.
> -
> -In the upstream Linux build system, the debian directory is a
> -throwaway build product. However, after elbe debianization, this
> -directory should be preserved and maintained like any other part of
> -the build system. This patch removes the directory from the git
> -ignore file and from the clean rules.
> -
> -Signed-off-by: Richard Cochran <rcochran at linutronix.de>
> ----
> - .gitignore | 5 -----
> - scripts/package/Makefile | 3 ---
> - 2 files changed, 8 deletions(-)
> -
> -diff --git a/.gitignore b/.gitignore
> -index fd3a355..d926133 100644
> ---- a/.gitignore
> -+++ b/.gitignore
> -@@ -52,11 +52,6 @@ Module.symvers
> - /Module.markers
> -
> - #
> --# Debian directory (make deb-pkg)
> --#
> --/debian/
> --
> --#
> - # tar directory (make tar*-pkg)
> - #
> - /tar-install/
> -diff --git a/scripts/package/Makefile b/scripts/package/Makefile
> -index 493e226..aba11a3 100644
> ---- a/scripts/package/Makefile
> -+++ b/scripts/package/Makefile
> -@@ -97,9 +97,6 @@ bindeb-pkg: FORCE
> - $(MAKE) KBUILD_SRC=
> - +$(call cmd,builddeb)
> -
> --clean-dirs += $(objtree)/debian/
> --
> --
> - # tarball targets
> - # ---------------------------------------------------------------------------
> - tar%pkg: FORCE
> ---
> -2.1.4
> -
> diff --git a/docs/testspec.csv b/docs/testspec.csv
> index 6f4a13316e..593f71d268 100644
> --- a/docs/testspec.csv
> +++ b/docs/testspec.csv
> @@ -21,6 +21,6 @@ ELBE TestSpec,,,,
> 18,,Repo key verification,URLs to repo keys provide a key that don't belong to the specified repository,error should be reported, also during 'initvm create'
> 20,,build invalid project (RFS doesn't fit in IMG),"start build in background, after termination get report from initvm",build state is failed and error report available
> 21,grub installation,grub is installed and working with debian kernel,Boot image produced by elbe-desktop.xml in kvm,ssh login is possible
> -22,,grub is installed and working with latest stable kernel,"use ellbe/contrib' patches on latest stable kernel, build debian package, specify package in XML (no debian kernel in XML), build XML",ssh login is possible
> +22,,grub is installed and working with latest stable kernel,"build kernel debian package, specify package in XML (no debian kernel in XML), build XML",ssh login is possible
> 23,Repo key verification,noauth isn't set and no pubkey is provided,error should be detected in xml validation
> 24,modes,add tests for diet,tighten and setsel mode,for setsel also creating the xml file should be tested
> diff --git a/setup.py b/setup.py
> index d657f3119c..8660fa8cd0 100644
> --- a/setup.py
> +++ b/setup.py
> @@ -78,8 +78,6 @@ setup(name='elbe',
> glob.glob("docs/elbe-schema-reference*")),
> ('/usr/share/doc/elbe-doc/',
> glob.glob("docs/elbeoverview-en*")),
> - ('/usr/share/doc/elbe-doc/contrib/linux',
> - glob.glob("contrib/linux/*")),
> ('/usr/share/doc/elbe-doc/examples',
> glob.glob("examples/*xml")),
> ('/usr/share/doc/elbe-doc/examples/includes/prod',
--
Viraj Shah
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 16; Fax.: +49 7556 25 999 99
Hinweise zum Datenschutz finden Sie hier (Informations on data privacy
can be found here): https://linutronix.de/kontakt/Datenschutz.php
Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen |
Registergericht (Registration Court): Amtsgericht Freiburg i.Br. HRB700
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner
More information about the elbe-devel
mailing list