]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
Revert "UBUNTU: [packaging] dkms-build -- include versioned provides"
authorAndy Whitcroft <apw@canonical.com>
Thu, 6 Feb 2020 11:57:43 +0000 (11:57 +0000)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 6 Feb 2020 20:15:00 +0000 (14:15 -0600)
This reverts commit f6044e14d9a7d115ba3b1fe02b3b0c516d21d763.

BugLink: https://bugs.launchpad.net/bugs/1856414
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
debian/scripts/dkms-build

index 48f1567cf661a78537c4d0aeb962481ca2616c9c..15fc5d1bab23d86b5f4ef41402e1b35d53c98596 100755 (executable)
@@ -1,33 +1,6 @@
 #!/bin/bash
 set -e
 
-TEMP=$(getopt \
-       --name "$0" \
-       --options "" \
-       --longoptions "provides:" \
-       -- "$@"
-)
-if [ "$?" != 0 ]; then
-       echo "Usage: $0 ..." 1>&2
-       exit 1
-fi
-eval set -- "$TEMP"
-
-provides=''
-while [ "$#" -gt 0 ]
-do
-       case "$1" in
-       --provides)
-               provides="$2"
-               shift 2
-               ;;
-       --)
-               shift
-               break
-               ;;
-       esac
-done
-
 dkms_dir="$1"
 abi_flavour="$2"
 sign="$3"
@@ -55,24 +28,6 @@ built_using_record()
        sed -i -e "s/^\(linux:BuiltUsing=.*\)/\1$built_using, /" "$subst"
 }
 
-provides_record()
-{
-       local subst="$1"
-       local provides="$2"
-       if [ ! -f "$subst" ]; then
-               touch "$subst"
-       fi
-       if ! grep -q -s "^linux:Provides=" "$subst"; then
-               echo "linux:Provides=" >>"$subst"
-       fi
-       sed -i -e "s/^\(linux:Provides=.*\)/\1$provides, /" "$subst"
-}
-
-# Throw in a provides line if offered.
-if [ "$provides" != '' ]; then
-       provides_record "$srcdir/debian/$pkgname.substvars" "$provides"
-fi
-
 # ABI: returns present in $? and located path in lpackage_path when found.
 package_present()
 {