From 2b5391e7a4955bc3ab71663a5697c562ca58181e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 27 Jan 2016 00:53:50 +0000 Subject: [PATCH] linux-{headers,image}: Remove support for version-specific hooks This was inherited/cargo-culted from kernel-package, undocumented, and apparently useless. --- debian/changelog | 1 + debian/templates/headers.postinst.in | 7 ------- debian/templates/image.postinst.in | 7 ------- debian/templates/image.postrm.in | 6 ------ debian/templates/image.preinst.in | 6 ------ debian/templates/image.prerm.in | 6 ------ 6 files changed, 1 insertion(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0802214ce..cd140a379 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ linux (4.4-1~exp2) UNRELEASED; urgency=medium * linux-image: Make failure of depmod fatal, rather than asking what to do * [mips*] linux-image: Remove debconf question for requirement of initramfs * linux-image: Remove unnecessary debconf initialisations + * linux-{headers,image}: Remove support for version-specific hooks -- Ian Campbell Sat, 23 Jan 2016 08:23:05 +0000 diff --git a/debian/templates/headers.postinst.in b/debian/templates/headers.postinst.in index da14d3929..68b7ec788 100644 --- a/debian/templates/headers.postinst.in +++ b/debian/templates/headers.postinst.in @@ -14,13 +14,6 @@ if (-d "/etc/kernel/header_postinst.d") { die "Failed to process /etc/kernel/header_postinst.d"; } -if (-d "/etc/kernel/header_postinst.d/$version") { - print STDERR "Examining /etc/kernel/header_postinst.d/$version.\n"; - system ("run-parts --verbose --exit-on-error --arg=$version " . - "/etc/kernel/header_postinst.d/$version") && - die "Failed to process /etc/kernel/header_postinst.d/$version"; -} - exit 0; __END__ diff --git a/debian/templates/image.postinst.in b/debian/templates/image.postinst.in index e3b1a02d9..fd8ed7872 100755 --- a/debian/templates/image.postinst.in +++ b/debian/templates/image.postinst.in @@ -528,13 +528,6 @@ if (-d "/etc/kernel/postinst.d") { die "Failed to process /etc/kernel/postinst.d"; } -if (-d "/etc/kernel/postinst.d/$version") { - system ("run-parts --report --exit-on-error --arg=$version " . - "--arg=$realimageloc$kimage-$version " . - "/etc/kernel/postinst.d/$version") && - die "Failed to process /etc/kernel/postinst.d/$version"; -} - exit 0; __END__ diff --git a/debian/templates/image.postrm.in b/debian/templates/image.postrm.in index 7b13b7658..1530c5878 100755 --- a/debian/templates/image.postrm.in +++ b/debian/templates/image.postrm.in @@ -184,12 +184,6 @@ if (-d "/etc/kernel/postrm.d") { "/etc/kernel/postrm.d") && die "Failed to process /etc/kernel/postrm.d"; } -if (-d "/etc/kernel/postrm.d/$version") { - system ("run-parts --report --exit-on-error --arg=$version " . - "--arg=$realimageloc$kimage-$version " . - "/etc/kernel/postrm.d/$version") && - die "Failed to process /etc/kernel/postrm.d/$version"; -} # purge initramfs and related if ($ARGV[0] !~ /upgrade/) { diff --git a/debian/templates/image.preinst.in b/debian/templates/image.preinst.in index 891689e26..6beee566f 100755 --- a/debian/templates/image.preinst.in +++ b/debian/templates/image.preinst.in @@ -76,12 +76,6 @@ if (-d "/etc/kernel/preinst.d") { " /etc/kernel/preinst.d") && die "Failed to process /etc/kernel/preinst.d"; } -if (-d "/etc/kernel/preinst.d/$version") { - system ("run-parts --report --exit-on-error --arg=$version" . - " --arg=$realimageloc$kimage-$version" . - " /etc/kernel/preinst.d/$version") && - die "Failed to process /etc/kernel/preinst.d/$version"; -} exit 0; diff --git a/debian/templates/image.prerm.in b/debian/templates/image.prerm.in index 45f7cff14..5f2ee6761 100755 --- a/debian/templates/image.prerm.in +++ b/debian/templates/image.prerm.in @@ -120,12 +120,6 @@ if (-d "/etc/kernel/prerm.d") { "--arg=$realimageloc$kimage-$version /etc/kernel/prerm.d") && die "Failed to process /etc/kernel/prerm.d"; } -if (-d "/etc/kernel/prerm.d/$version") { - system ("run-parts --report --exit-on-error --arg=$version" . - " --arg=$realimageloc$kimage-$version " . - "/etc/kernel/prerm.d/$version") && - die "Failed to process /etc/kernel/prerm.d/$version"; -} exit 0; __END__