Muehlenhoff has submitted this change and it was merged.

Change subject: Tighten dependency
......................................................................


Tighten dependency

Also commit some changes which we previously only on copper.

Change-Id: If40d643c104cb54d2690f7fe8bafb3cbec7bf3a9
---
M debian/changelog
M debian/control
M debian/linux-meta.postinst
3 files changed, 20 insertions(+), 2 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index fc26492..3a9bcba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+linux-meta (1.6) jessie-wikimedia; urgency=medium
+
+  * Tighten dependency for latest 3.19 update
+
+ -- Moritz Muehlenhoff <[email protected]>  Mon, 25 Jan 2016 14:42:42 +0100
+
+linux-meta (1.5) jessie-wikimedia; urgency=medium
+
+  * Fix execution of update-grub
+
+ -- Moritz Muehlenhoff <[email protected]>  Tue, 19 Jan 2016 20:01:51 +0000
+
+linux-meta (1.4) jessie-wikimedia; urgency=medium
+
+  * Bump for 3.19.3-10
+
+ -- Moritz Muehlenhoff <[email protected]>  Tue, 19 Jan 2016 20:49:37 
+0100
+
 linux-meta (1.3) jessie-wikimedia; urgency=medium
 
   * Bump to kernel ABI 3.19.0-2 / version 3.19.3-9
diff --git a/debian/control b/debian/control
index 876dbdd..e5a3393 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@
 
 Package: linux-meta
 Architecture: any
-Depends: linux-image-3.19.0-2-amd64 [amd64], initramfs-tools, grub2-common, 
firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
+Depends: linux-image-3.19.0-2-amd64 [amd64] (>= 3.19.3-10), initramfs-tools, 
grub2-common, firmware-bnx2x (>= 0.43-1~wmf1), linux-tools-3.19, ${misc:Depends}
 Description: Meta package for kernel images
  This package depends on the latest Linux kernel used in the WMF environment.
  It can also serve to depend on firmware packages not part of the stock Linux
diff --git a/debian/linux-meta.postinst b/debian/linux-meta.postinst
index 89a6fdd..506bc94 100644
--- a/debian/linux-meta.postinst
+++ b/debian/linux-meta.postinst
@@ -6,8 +6,8 @@
 
 if [ ! -e /boot/initrd.img-$KVERSION ] ; then
     update-initramfs -c -k $KVERSION
-    update-grub
 fi
+update-grub
 
 #DEBHELPER#
 

-- 
To view, visit https://gerrit.wikimedia.org/r/266227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If40d643c104cb54d2690f7fe8bafb3cbec7bf3a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux-meta
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to