Re: Porter roll call for Debian Stretch

2016-08-21 Thread Ian Campbell
On Wed, 2016-08-17 at 22:05 +0200, ni...@thykier.net wrote:
>  * If we were to enable -fPIE/-pie by default in GCC-6, should that change
>    also apply to this port? [0]

OOI does this relate somehow to the porter roll-call/architecture
qualification or was this just a convenient mail to piggy-back this
question to all porters on?

Or to put it another way, is there any penalty/risk (from a release
PoV) to an arch which says no here?

Ian.



Bug#843139: nmu: lua5.1_5.1.5-8.1+b1

2016-11-04 Thread Ian Campbell
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: binnmu

Hi,

My package (qcontrol) fails to build because lua5.1 has not yet been rebuilt
with -fPIC on armhf. Please would you schedule a binNMU on at least armhf
(although it might be worth doing them all?).

I have some other changes I could usefully make to qcontrol so I will upload a
new version once the binNMU is completed, so no need for a binNMU of qcontrol
itself.

See [0] for more info/background.

Thanks,
Ian.

nmu lua5.1_5.1.5-8.1+b1 . armhf . unstable . -m "Rebuild with new compiler 
PIE/PIC defaults"

[0] https://lists.debian.org/debian-devel/2016/10/msg00858.html

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel, arm64

Kernel: Linux 4.7.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)



Bug#843139: nmu: lua5.1_5.1.5-8.1+b1

2016-11-04 Thread Ian Campbell
> Please would you schedule a binNMU on at least armhf

FYI I did a manual rebuild of lua5.1 locally and can confirm that
qcontrol builds with the updated version.

Thanks,
Ian.



Bug#771905: unblock: grub2/2.02~beta2-17

2014-12-07 Thread Ian Campbell
On Sat, 2014-12-06 at 18:55 +0100, Ivo De Decker wrote:
> Control: tags -1 d-i
> 
> Hi,
> 
> On Wed, Dec 03, 2014 at 12:14:19PM +, Colin Watson wrote:
> > On Wed, Dec 03, 2014 at 11:39:14AM +, Ian Campbell wrote:
> > > Please unblock package grub2
> > 
> > Seconded.
> 
> This needs the d-i ack.

Right, thanks, I knew to CC Kibi but not to add the tag.

Ian.


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1417955561.30802.6.ca...@debian.org



Bug#773224: (preapproval) unblock: grub2/2.02~beta2-19

2014-12-15 Thread Ian Campbell
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock d-i

Version 2.02~beta2-18 (in Jessie, unblocked by #772959) added a new debconf
template.

A call for translations has been sent out which is has a deadline of the 21st,
I'd like to upload -19 the translations in. Hopefully soon after.

The main reason for asking for preapproval is I am trying to decide whether to
also include a fix for #771249 which is an update to the upstream translations.
Would that be acceptable or not?

Full disclosure, as you can see in #771249 there is some packaging faff
relating to the VCS but the eventual impact on the source package isn't so bad.
If anything I'd be going with the "master-po-tp.org" solution described in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771249#25 which is to move
the active translations to po-tp.org rather than messing around with the
baseline upstream branch as described earlier in the log.)

A diff is below, ignoring the *.po files themselves, and files which are copied
pristine from po=>po-tp.org. I'm expecting the answer is no, but thought I
would ask.

I hope -19 will also contain the eventual fixes for #773004, #773092 (both
issue arising from the new stuff in -18), but I wouldn't expect you to
preapprove those without seeing them. (Just mentioning them for completeness)

This would need a d-i ack, I've CC-d Kibi and set the tag

Cheers,
Ian.

Diff based on contents of git+ssh://git.debian.org/git/pkg-grub/grub.git This is
just the bits associated with #771249.

$ git diff -M origin/master origin/people/ijc/master-po-tp.org  | filterdiff 
-p1 -x po-tp.org/\*.po | diffstat -p1
 Makefile.am|2 
 Makefile.util.def  |2 
 autogen.sh |4 
 configure.ac   |2 
 debian/.git-dpm|4 
 debian/changelog   |2 
 debian/clean   |1 
 debian/patches/po-tp.org--create.patch |16773 +++
 debian/patches/po-tp.org--orig.patch   |169479 
+
 debian/patches/po-tp.org--use.patch|  137 
 debian/patches/series  |3 
 debian/rules   |1 
 linguas.sh |8 
 po-tp.org/LINGUAS  |1 
 po-tp.org/POTFILES-shell.in|   18 
 po-tp.org/POTFILES.in  | 1262 
 po-tp.org/grub.pot | 6543 +
 tests/gettext_strings_test.in  |   12 
 tests/util/grub-shell.in   |2 
 19 files changed, 194238 insertions(+), 18 deletions(-)

unblock grub2/2.02~beta2-19

-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/20141215200233.16667.22906.report...@dagon.hellion.org.uk



Bug#773224: (preapproval) unblock: grub2/2.02~beta2-19

2014-12-17 Thread Ian Campbell
On Wed, 2014-12-17 at 18:12 -0400, David Prévot wrote:
> Le 17/12/2014 16:59, Ian Campbell a écrit :
> > On Wed, 2014-12-17 at 20:15 +, Jonathan Wiltshire wrote:
> >> Control: tag -1 moreinfo
> >>
> >> On Mon, Dec 15, 2014 at 08:02:33PM +, Ian Campbell wrote:
> >>> The main reason for asking for preapproval is I am trying to decide 
> >>> whether to
> >>> also include a fix for #771249 which is an update to the upstream 
> >>> translations.
> >>> Would that be acceptable or not?
> >>
> >> Tricky... how bad *are* the upstream translations? Is this just polish or
> >> are there some problems with them?
> 
> The problem is they are incomplete and outdated: the upstream
> translation call happened after this version (2.02~beta2) was published,
> so all translations (as proposed in #771249) have been submitted
> upstream after this release.

Ah, I hadn't realised this.

> FWIW, the last patch proposed in #771249 was optimized WRT the size of
> the diff:

How was this optimization done? My thinking was that it would be better
for future updates to stick with the raw result of running linguas.sh,
but making a decision on a cleaned up diffstat lacking all the noise
would probably more helpful, so being able to rerun would be useful.

I notice that my previous cleanup attempt should have included ??_??.po
too, to reduce the noise from zh_CN.po, making the diffstat:

 ast.po   |   11 
 ca.po|  619 ++
 da.po|   28 
 de.po|  563 ++---
 eo.po|   16 
 es.po|  524 ++---
 fi.po|  778 +++
 fr.po|  244 --
 gl.po|   22 
 hu.po| 2429 +++
 id.po|  278 +-
 it.po|  596 ++---
 ja.po|   12 
 lt.po| 1493 +++---
 nb.po| 6429 +++
 nl.po|  629 ++
 pa.po|9 
 pl.po|  590 ++---
 pt_BR.po |  498 ++--
 ru.po|  529 ++---
 sl.po|   30 
 sv.po| 2658 +-
 tr.po|   38 
 uk.po|  232 --
 vi.po|  955 -
 zh_CN.po |   18 
 zh_TW.po |   20 
 27 files changed, 12585 insertions(+), 7663 deletions(-)

Which still differs from yours (includes a lot more translations for one
thing, but that might just be time having passed and more translations
being contributed)

Ian.


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1418855282.26985.38.ca...@debian.org



Bug#773714: unblock: grub2/2.02~beta2-19

2014-12-22 Thread Ian Campbell
Package: release.debian.org
Severity: normal
Tags: d-i
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package grub2

Version -18 added a fix for #767037 (workaround for buggy EFI implementations)
which included a new debconf template. -19 adds translations for the new
template (including a wording fix to the English) and fixes two issues with
that new funcitionality (one, #773092, is important, the other, #773004, is
fairly minor but quite irritating in practice).

I also added a README.source.

Note that this upload does not include the upstream translation updates
discussed in preapproval bug #773224, since there wasn't an obvious yes to that
question.

I've filtered the actual debian/po templates from the debdiff below
("filterdiff -p1 -x debian/po/\*").

diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog
--- grub2-2.02~beta2/debian/changelog   2014-12-08 08:38:41.0 +
+++ grub2-2.02~beta2/debian/changelog   2014-12-22 11:55:53.0 +
@@ -1,3 +1,45 @@
+grub2 (2.02~beta2-19) unstable; urgency=medium
+
+  [ Steve McIntyre ]
+  * Handle case insensitivity of VFAT filesystem on /boot/EFI when installing
+extra cpoy of grub-efi to the removable media path
+/boot/efi/EFI/BOOT/BOOT$ARCH.EFI (Closes: #773092)
+  * Make the force_efi_extra_removable debconf prompt only show up when
+configuring grub-*efi*. Closes: #773004
+
+  [ Ian Campbell ]
+  * Improvements to English wording of new debconf template from Justin B Rye.
+  * Add debian/README.source.
+
+  [ Debconf translations ]
+  * [eu] Basque (Iñaki Larrañaga Murgoitio, Closes: #772946)
+  * [be] Belarusian (Viktar Siarheichyk, Closes: #773054)
+  * [pt_BR] Brazilian Portuguese (Adriano Rafael Gomes, Closes: #773682)
+  * [bg] Bulgarian (Damyan Ivanov, Closes: #772878)
+  * [cs] Czech (Miroslav Kure, Closes: #772924)
+  * [nl] Dutch (Frans Spiesschaert, Closes: 773637)
+  * [eo] Esperanto (Felipe Castro, Closes: #773096)
+  * [fi] Finish (Timo Jyrinki, Closes: #772921)
+  * [fr] French (Christian PERRIER, Closes: #772771)
+  * [de] German (Martin Eberhard Schauer, Closes: #773664)
+  * [el] Greek (Panagiotis Georgakopoulos, Closes: #773068)
+  * [he] Hebrew (Omer Zak, Closes: #773377)
+  * [is] Icelandic (Sveinn í Felli, Closes: #772922)
+  * [it] Italian (Luca Monducci, Closes: #773553)
+  * [kk] Kazakh (Baurzhan Muftakhidinov, Closes: #772916)
+  * [lt] Lithuanian (Rimas Kudelis, Closes: #773060)
+  * [pl] Polish (Łukasz Dulny, Closes: #772930)
+  * [ro] Romanian (Andrei POPESCU, Closes: #773349)
+  * [ru] Russian (Yuri Kozlov, Closes: #773211)
+  * [sl] Slovenian (Vanja Cvelbar, Closes: #773508)
+  * [es] Spanish (Manuel "Venturi" Porras Peralta, Closes: #773222)
+  * [sv] Swedish (Martin Bagge & Anders Jonsson, Closes: 773208)
+  * [th] Thai (Theppitak Karoonboonyanan, Closes: #773160)
+  * [zh_TW] Traditional Chinese (Vincent W. Chen, Closes: #773418)
+  * [tr] Turkish (Mert Dirik, Closes: #773666)
+
+ -- Ian Campbell   Mon, 22 Dec 2014 11:55:33 +
+
 grub2 (2.02~beta2-18) unstable; urgency=medium
 
   [ Steve McIntyre ]
diff -Nru grub2-2.02~beta2/debian/config.in grub2-2.02~beta2/debian/config.in
--- grub2-2.02~beta2/debian/config.in   2014-12-07 16:41:50.0 +
+++ grub2-2.02~beta2/debian/config.in   2014-12-22 11:55:53.0 +
@@ -73,5 +73,9 @@
 
 db_input ${priority} grub2/linux_cmdline || true
 db_input medium grub2/linux_cmdline_default || true
-db_input low grub2/force_efi_extra_removable || true
+case @PACKAGE@ in
+  grub-*efi*)
+db_input low grub2/force_efi_extra_removable || true
+  ;;
+esac
 db_go
diff -Nru grub2-2.02~beta2/debian/.git-dpm grub2-2.02~beta2/debian/.git-dpm
--- grub2-2.02~beta2/debian/.git-dpm2014-12-08 08:38:08.0 +
+++ grub2-2.02~beta2/debian/.git-dpm2014-12-22 11:55:53.0 +
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-dfcbcb60e5428bcb87ba96011c7b7ab1b7891fa1
-dfcbcb60e5428bcb87ba96011c7b7ab1b7891fa1
+617a691e4a95e67967ca8b0c77c59d347df182d6
+617a691e4a95e67967ca8b0c77c59d347df182d6
 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
 grub2_2.02~beta2.orig.tar.xz
diff -Nru grub2-2.02~beta2/debian/patches/grub-install-extra-removable.patch 
grub2-2.02~beta2/debian/patches/grub-install-extra-removable.patch
--- grub2-2.02~beta2/debian/patches/grub-install-extra-removable.patch  
2014-12-08 08:38:08.0 +
+++ grub2-2.02~beta2/debian/patches/grub-install-extra-removable.patch  
2014-12-22 11:55:53.0 +
@@ -1,4 +1,4 @@
-From dfcbcb60e5428bcb87ba96011c7b7ab1b7891fa1 Mon Sep 17 00:00:00 2001
+From 617a691e4a95e67967ca8b0c77c59d347df182d6 Mon Sep 17 00:00:00 2001
 From: Steve McIntyre <93...@debian.org>
 Date: Wed, 3 Dec 2014 01:25:12 +
 Subject: Add support for forcing EFI installation to the removable media path
@@ -12,17 +12,17 @@
 
 Signed-off-by: Steve McIntyre

Bug#773224: (preapproval) unblock: grub2/2.02~beta2-19

2014-12-22 Thread Ian Campbell
On Wed, 2014-12-17 at 20:15 +, Jonathan Wiltshire wrote:
> Control: tag -1 moreinfo
> 
> On Mon, Dec 15, 2014 at 08:02:33PM +0000, Ian Campbell wrote:
> > The main reason for asking for preapproval is I am trying to decide whether 
> > to
> > also include a fix for #771249 which is an update to the upstream 
> > translations.
> > Would that be acceptable or not?
> 
> Tricky... how bad *are* the upstream translations? Is this just polish or
> are there some problems with them?

FYI, I've uploaded -19 without this set of changes (see #773714).

I'm still prepared to fix #771249 in another upload if it is deemed
acceptable, so not closing this bug myself.

Cheers,
Ian.


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1419260288.26985.189.ca...@debian.org



Bug#774551: unblock: flash-kernel/3.30

2015-01-04 Thread Ian Campbell
Package: release.debian.org
Severity: normal
Tags: d-i
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package flash-kernel. This package produces a udeb, so kibi CCd
and d-i tag added.

Testing currently contains 3.28.

3.29 was a brown paper bag upload to revert an accidental upload of a version
intended for experimental to unstable. It fixed the content type for a
translation but was otherwise a nop compared with 3.28.

3.30 adds support for the TI OMAP5 uEVM board (#77325) and LinkSprite pcDuino3
(user request on debian-arm@) as well as an alternative name for the BeagleBone
Black (#773890).

It also avoids issues arising from the old ambigous name used by BBB which
could be confused for the BeagleBone White by refusing to boot on the White
(which is a far less common platform, which we don't currently support). Fixing
things to work on both would be a far larger patch not suitable for Jessie (at
least in the abasence of a user request). This was discussed in #773890).

Lastly this version makes sure that /dev/mtdblock* will be available before use
by ensuring that the kernel module is loaded (#773991).

Thanks!

Ian.

debdiff: 
diff -Nru flash-kernel-3.28/bootscript/bootscr.beaglebone 
flash-kernel-3.30/bootscript/bootscr.beaglebone
--- flash-kernel-3.28/bootscript/bootscr.beaglebone 2014-09-04 
07:14:17.0 +0100
+++ flash-kernel-3.30/bootscript/bootscr.beaglebone 2014-12-30 
15:31:54.0 +
@@ -1,4 +1,14 @@
-# boot script for BeagleBone
+# boot script for BeagleBone Black
+
+# BeagleBone white uses a different .dtb file, and flash-kernel is
+# currently unable to support multiple .dtb files.
+if test "${board_name}" = "A335BONE"
+then
+  echo "BeagleBone white detected, unsupported platform."
+  echo "Exiting in 10 seconds..."
+  sleep 10
+  exit
+fi
 
 setenv device mmc
 setenv partition ${bootpart}
diff -Nru flash-kernel-3.28/db/all.db flash-kernel-3.30/db/all.db
--- flash-kernel-3.28/db/all.db 2014-10-13 04:01:11.0 +0100
+++ flash-kernel-3.30/db/all.db 2014-12-30 15:31:54.0 +
@@ -301,6 +301,13 @@
 U-Boot-Script-Name: bootscr.sunxi
 Required-Packages: u-boot-tools
 
+Machine: LinkSprite pcDuino3
+Kernel-Flavors: armmp armmp-lpae
+Boot-Script-Path: /boot/boot.scr
+DTB-Id: sun7i-a20-pcduino3.dtb
+U-Boot-Script-Name: bootscr.sunxi
+Required-Packages: u-boot-tools
+
 Machine: Linksys NSLU2
 Method: slug
 Kernel-Flavors: ixp4xx
@@ -574,12 +581,20 @@
 Bootloader-Sets-Incorrect-Root: yes
 
 Machine: TI AM335x BeagleBone
+Machine: TI AM335x BeagleBone Black
 Kernel-Flavors: armmp
 DTB-Id: am335x-boneblack.dtb
 Boot-Script-Path: /boot/boot.scr
 U-Boot-Script-Name: bootscr.beaglebone
 Required-Packages: u-boot-tools
 
+Machine: TI OMAP5 uEVM board
+Kernel-Flavors: armmp armmp-lpae
+DTB-Id: omap5-uevm.dtb
+U-Boot-Script-Name: bootscr.uboot-generic
+Boot-Script-Path: /boot/boot.scr
+Required-Packages: u-boot-tools
+
 Machine: Toshiba AC100 / Dynabook AZ
 Method: android
 Android-Boot-Device: /dev/mmcblk0
diff -Nru flash-kernel-3.28/debian/changelog flash-kernel-3.30/debian/changelog
--- flash-kernel-3.28/debian/changelog  2014-10-13 10:08:45.0 +0100
+++ flash-kernel-3.30/debian/changelog  2014-12-30 15:31:54.0 +
@@ -1,3 +1,27 @@
+flash-kernel (3.30) unstable; urgency=medium
+
+  [ Ian Campbell ]
+  * Support for TI OMAP5 uEVM board (Patch from Chen Baozi, Closes: #773255)
+  * Support for alternative machine name for BeagleBone Black. The old name was
+ambiguous with the original BeagleBone (often called "White"), detect if
+booting on a BeagleBone white and print an error since the DTB will be
+wrong. We don't currently support the White. (Closes: #773890)
+  * Ensure mtdblock driver is loaded before accessing /dev/mtdblock*.
+(Closes: #773991)
+
+  [ Karsten Merker ]
+  * Add a machine db entry for the LinkSprite pcDuino3
+
+ -- Ian Campbell   Tue, 30 Dec 2014 15:31:42 +
+
+flash-kernel (3.29) unstable; urgency=medium
+
+  * Correct Content-Transfer-Encoding in zn_CH.po.
+  * No other changes vs 3.28, this supersedes the brown paper bag upload of
+3.29~exp.1 to unstable.
+
+ -- Ian Campbell   Sat, 13 Dec 2014 11:19:47 +0000
+
 flash-kernel (3.28) unstable; urgency=medium
 
   [ Ian Campbell ]
diff -Nru flash-kernel-3.28/debian/po/zh_CN.po 
flash-kernel-3.30/debian/po/zh_CN.po
--- flash-kernel-3.28/debian/po/zh_CN.po2011-08-12 02:00:53.0 
+0100
+++ flash-kernel-3.30/debian/po/zh_CN.po2014-12-30 15:31:54.0 
+
@@ -39,7 +39,7 @@
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Type: text
diff -Nru flash-kernel-3.28/functions flash-kernel-3.30/functions
--- flash-kernel-3.28/fu

Re: Release impact of introducing a new archive section?

2016-12-11 Thread Ian Campbell
On Thu, 2016-12-08 at 21:39 -0800, Josh Triplett wrote:
> I've now written and submitted all of these patches.

Might it be useful to have this list of names and descriptions in some
canonical packaged location, such that updating these tools is just a
version bump on a build dep, or even a runtime dep? Best case maybe it
would be possible to arrange for it to be a simple binNMU.

(my first thought was a canonical online location, but these tools may
not want that at runtime and can't rely on it at build time, but maybe
that should be the source used for the package)

Ian.



Bug#781305: unblock: flash-kernel/3.34

2015-03-27 Thread Ian Campbell
Package: release.debian.org
Severity: normal
Tags: d-i
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package flash-kernel both deb and udeb.

flash-kernel-installer will automatically install u-boot-tools as needed, so
installation via the installer works fine, however users who do things manually
(i.e. with debootstrap) are frequently caught out by the lack of u-boot-tools.
Since u-boot-tools is needed on the majority of systems these days and in any
case is quite small bump the Suggests into a Recommends.

I believe that this will also fix #773645 in debian-cd since it considers
Recommends when deciding to include stuff on CD1.

diff -Nru flash-kernel-3.33/debian/changelog flash-kernel-3.34/debian/changelog
--- flash-kernel-3.33/debian/changelog  2015-03-05 06:56:52.0 +
+++ flash-kernel-3.34/debian/changelog  2015-03-26 21:37:26.0 +
@@ -1,3 +1,11 @@
+flash-kernel (3.34) unstable; urgency=medium
+
+  * Update u-boot-tools to Recommends. In practice it is needed on most systems
+but having it installed only by flash-kernel-installer means it is missed
+in manual configurations. (Closes: #780994)
+
+ -- Ian Campbell   Thu, 26 Mar 2015 21:37:16 +
+
 flash-kernel (3.33) unstable; urgency=medium
 
   [ Karsten Merker ]
diff -Nru flash-kernel-3.33/debian/control flash-kernel-3.34/debian/control
--- flash-kernel-3.33/debian/control2015-03-05 06:56:52.0 +
+++ flash-kernel-3.34/debian/control2015-03-26 21:37:26.0 +
@@ -18,7 +18,7 @@
  initramfs-tools (>= 0.92f),
  linux-base (>= 3.2),
  ucf
-Suggests: u-boot-tools
+Recommends: u-boot-tools
 Description: utility to make certain embedded devices bootable
  flash-kernel is a script which will put the kernel and initramfs in
  the boot location of embedded devices that don't load the kernel and


unblock flash-kernel/3.34

-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/20150327100114.12349.91218.report...@dagon.hellion.org.uk



Bug#781305: unblock: flash-kernel/3.34

2015-03-29 Thread Ian Campbell
On Sat, 2015-03-28 at 19:04 +, Adam D. Barratt wrote:
> On Fri, 2015-03-27 at 10:01 +0000, Ian Campbell wrote:
> > Please unblock package flash-kernel both deb and udeb.
> > 
> > flash-kernel-installer will automatically install u-boot-tools as needed, so
> > installation via the installer works fine, however users who do things 
> > manually
> > (i.e. with debootstrap) are frequently caught out by the lack of 
> > u-boot-tools.
> > Since u-boot-tools is needed on the majority of systems these days and in 
> > any
> > case is quite small bump the Suggests into a Recommends.
> 
> Unblocked,

Thanks.

>  CCing for a KiBiack.

Seems my X-debbugs-cc failed somehow, so thanks!

Ian.


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1427643009.1320.50.ca...@debian.org



Bug#783080: unblock: oldsys-preseed/3.16

2015-04-21 Thread Ian Campbell
Package: release.debian.org
Severity: normal
Tags: d-i
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package oldsys-preseed

This fixes #783019 which is a failure to correctly function on many kirkwood
and orion5x armel platforms. Since this package exists to aid with headless
installs d-i is basically unusable on any affected system, since it will ask
questions on the (non-existent) serial port before enabling the network
install path.

This package only produces udebs.

diff -Nru oldsys-preseed-3.15/debian/changelog 
oldsys-preseed-3.16/debian/changelog
--- oldsys-preseed-3.15/debian/changelog2015-02-26 03:55:12.0 
+
+++ oldsys-preseed-3.16/debian/changelog2015-04-21 06:07:22.0 
+0100
@@ -1,3 +1,11 @@
+oldsys-preseed (3.16) unstable; urgency=medium
+
+  [ Ian Campbell ]
+  * Avoid exiting prematurely on arm*/orion5x or arm*/kirkwood platforms when
+they do not use device tree. (Closes: #783019)
+
+ -- Christian Perrier   Tue, 21 Apr 2015 07:07:22 +0200
+
 oldsys-preseed (3.15) unstable; urgency=medium
 
   [ Michael Walle ]
diff -Nru oldsys-preseed-3.15/oldsys-preseed oldsys-preseed-3.16/oldsys-preseed
--- oldsys-preseed-3.15/oldsys-preseed  2015-02-26 03:53:17.0 +
+++ oldsys-preseed-3.16/oldsys-preseed  2015-04-21 04:01:47.0 +0100
@@ -115,7 +115,11 @@
arm*/orion5x | arm*/kirkwood)
machine=$(grep "^Hardware" /proc/cpuinfo | sed 
's/Hardware\s*:\s*//')
# /proc/device-tree may not exist on all architectures
-   dt_model=$(cat /proc/device-tree/model 2>/dev/null)
+   if [ -e /proc/device-tree/model ] ; then
+   dt_model=$(cat /proc/device-tree/model 2>/dev/null)
+   else
+   dt_model="UNKNOWN"
+   fi
if echo "$machine" | grep -q "^Buffalo/Revogear Kurobox Pro"; 
then
check_file /proc/mtd
rootfs=$(get_mtdblock "rootfs")

unblock oldsys-preseed/3.16

-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/20150421183807.22117.46713.report...@dagon.hellion.org.uk



Bug#784905: jessie-pu: (preapproval) package qcontrol/0.5.4-1

2015-05-10 Thread Ian Campbell
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

I'd like to fix #781886 "qcontrol failure to start on boot sometimes (jessie,
systemd?)" in Jessie.

The issue is that when running in LSB compat mode the devices may not have been
created before the initscript runs. This isn't noticed under sysvinit because
there is an implicit (or perhaps explicit) udev settle somewhere earlier on.

However the proper fix (enabling full systemd support) is IMHO too intrusive
for a stable update (see below for the full patch in case you disagree). So
instead I would like to upload a workaround:

diff --git a/debian/qcontrol.qcontrold.init b/debian/qcontrol.qcontrold.init
index ccbcb22..55bd5a1 100644
--- a/debian/qcontrol.qcontrold.init
+++ b/debian/qcontrol.qcontrold.init
@@ -38,6 +38,11 @@ set -e
 
 case "$1" in
 start)
+   # Ensure that /dev/input/by-path/platform-gpio-keys-event has
+   # arrived. Under systemd LSB compatibility mode it may not
+   # have yet.
+   udevadm settle
+
log_daemon_msg "Starting qcontrol daemon" "qcontrol"
if start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- -d; then
log_end_msg 0

I'm thinking that the best way to approach this would be to upload the
workaround to Sid and wait for it to propagate to Stretch, so it gets some
degree of real world testing and then upload the workaround upload to Jessie-pu
and carry on with the proper fix in Sid+Stretch (and probably jessie-backports).

How does that sound?

Cheers,
Ian.

The full/proper fix (WIP) for Stretch, FYI (note that the build will autodetect
libsystemd-daemon-dev and enable some runtime support too):

diff --git a/debian/changelog b/debian/changelog
index 1b44c08..c4fb6ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qcontrol (0.5.4-2) UNRELEASED; urgency=medium
 
   * Update Vcs-* to point to anonscm.
+  * Install and enable systemd unit files and corresponding udev rule.
+(Closes: #781886)
 
  -- Ian Campbell   Sun, 14 Sep 2014 16:07:45 +0100
 
diff --git a/debian/control b/debian/control
index 573697f..7fa8ebc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: qcontrol
 Section: utils
 Priority: optional
 Maintainer: Ian Campbell 
-Build-Depends: debhelper (>= 9), liblua5.1-0-dev, pkg-config
+Build-Depends: debhelper (>= 9), libsystemd-daemon-dev, dh-systemd, 
liblua5.1-0-dev, pkg-config
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/collab-maint/qcontrol.git
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/qcontrol.git
diff --git a/debian/qcontrol.install b/debian/qcontrol.install
index ab7899e..25d1727 100644
--- a/debian/qcontrol.install
+++ b/debian/qcontrol.install
@@ -1 +1,4 @@
-qcontrol   usr/sbin/
+qcontrol   usr/sbin/
+systemd/qcontrold.service  lib/systemd/system/
+systemd/qcontrold.socket   lib/systemd/system/
+systemd/qcontrol.service   lib/systemd/system/
diff --git a/debian/qcontrol.rules b/debian/qcontrol.rules
new file mode 100644
index 000..6fdab10
--- /dev/null
+++ b/debian/qcontrol.rules
@@ -0,0 +1,3 @@
+# qcontrold.socket requires notification of
+# /dev/input/by-path/platform-gpio-keys-event's arrival
+KERNELS=="gpio-keys", SUBSYSTEMS=="platform", DRIVERS=="gpio-keys", 
TAG+="systemd"
diff --git a/debian/rules b/debian/rules
index 9b88a50..a1ba03e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,11 +12,15 @@ UDEB_DIRS   = lib/debian-installer-startup.d \
 CONFIGS= ts209.lua ts219.lua ts409.lua ts41x.lua
 
 %:
-   dh $@
+   dh $@ --with systemd
 
 override_dh_auto_install:
dh_install
 
+   install -d debian/$(PACKAGE)/lib/udev/rules.d
+   install -m0644 debian/qcontrol.rules \
+   debian/$(PACKAGE)/lib/udev/rules.d/60-qcontrol.rules
+
# Install the following "manually" as they need a rename
@set -ex; $(foreach PACKAGE, $(PACKAGES), \
$(foreach CONFIG, $(CONFIGS), \


-- System Information:
Debian Release: 8.0
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'unstable'), (500, 'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/20150510124534.16900.85185.report...@dagon.hellion.org.uk



Bug#784905: jessie-pu: (preapproval) package qcontrol/0.5.4-1

2015-05-19 Thread Ian Campbell
On Sun, 2015-05-10 at 13:45 +0100, Ian Campbell wrote:
> I'm thinking that the best way to approach this would be to upload the
> workaround to Sid and wait for it to propagate to Stretch, so it gets some
> degree of real world testing and then upload the workaround upload to 
> Jessie-pu
> and carry on with the proper fix in Sid+Stretch (and probably 
> jessie-backports).

FYI the workaround reach Stretch in qcontrol 0.5.4-2.

Ian.


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1432060119.5748.94.ca...@debian.org



Bug#784905: jessie-pu: (preapproval) package qcontrol/0.5.4-1

2015-05-30 Thread Ian Campbell
On Thu, 2015-05-28 at 18:55 +0100, Adam D. Barratt wrote:
> Control: tags -1 + confirmed
> 
> On Sun, 2015-05-10 at 13:45 +0100, Ian Campbell wrote:
> > I'd like to fix #781886 "qcontrol failure to start on boot sometimes 
> > (jessie,
> > systemd?)" in Jessie.
> > 
> > The issue is that when running in LSB compat mode the devices may not have 
> > been
> > created before the initscript runs. This isn't noticed under sysvinit 
> > because
> > there is an implicit (or perhaps explicit) udev settle somewhere earlier on.
> > 
> > However the proper fix (enabling full systemd support) is IMHO too intrusive
> > for a stable update (see below for the full patch in case you disagree). So
> > instead I would like to upload a workaround:
> 
> Assuming that the workaround has been tested on jessie, please go ahead.

Thanks I've just uploaded 0.5.4-1+deb8u1 to jessie, debdiff below. I've
tested it locally on Jessie, although the issue is intermittent.

I should probably have though to mention this before, but src:qcontrol
does generate udebs, which are included in the d-i initrds. The change
in question does not impact them at all since they don't start the
daemon and use qcontrol in one-shot mode only. I've CCd Kibi just in
case this is an issue.

Ian.

diff -Nru qcontrol-0.5.4/debian/changelog qcontrol-0.5.4/debian/changelog
--- qcontrol-0.5.4/debian/changelog 2014-04-11 17:40:46.0 +0100
+++ qcontrol-0.5.4/debian/changelog 2015-05-30 13:35:38.0 +0100
@@ -1,3 +1,11 @@
+qcontrol (0.5.4-1+deb8u1) jessie; urgency=medium
+
+  * Wait for necessary devices to appear before starting.
+(Closes: #781886). This works around an issue exposed by systemd LSB
+compatibility mode. Proper systemd support will come later.
+
+ -- Ian Campbell   Sat, 30 May 2015 13:35:21 +0100
+
 qcontrol (0.5.4-1) unstable; urgency=low
 
   * New upstream release 0.5.4.
diff -Nru qcontrol-0.5.4/debian/qcontrol.qcontrold.init 
qcontrol-0.5.4/debian/qcontrol.qcontrold.init
--- qcontrol-0.5.4/debian/qcontrol.qcontrold.init   2013-10-20 
10:12:28.0 +0100
+++ qcontrol-0.5.4/debian/qcontrol.qcontrold.init   2015-05-30 
13:35:38.0 +0100
@@ -38,6 +38,11 @@
 
 case "$1" in
 start)
+   # Ensure that /dev/input/by-path/platform-gpio-keys-event has
+   # arrived. Under systemd LSB compatibility mode it may not
+   # have yet.
+   udevadm settle
+
log_daemon_msg "Starting qcontrol daemon" "qcontrol"
if start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- -d; then
log_end_msg 0



signature.asc
Description: This is a digitally signed message part


Bug#790833: jessie-pu: package flash-kernel/3.35

2015-07-01 Thread Ian Campbell
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

This upload fixes #788782 which results in upgrades to Jessie not booting on
the Freescale MX53 LOCO (AKA Quickstart) platform. The issue was that we had
ended up with duplicated entries for this system, one which handled device tree
and one which used the older board file mechanism, and that the Wheezy->Jessie
kernel upgrade switched which one was needed, hence f-k would do the wrong
thing for the new krnel whiletheo ld one was running.

Flash-kernel does have a udeb but there should be no functional impact to new
installs of Jessie since they will already be running the DT kernel during
install time.

debdiff:
diff -Nru flash-kernel-3.35/db/all.db flash-kernel-3.35+deb8u1/db/all.db
--- flash-kernel-3.35/db/all.db 2015-04-06 23:19:51.0 +0100
+++ flash-kernel-3.35+deb8u1/db/all.db  2015-06-17 08:22:41.0 +0100
@@ -131,7 +131,8 @@
 Bootloader-Sets-Incorrect-Root: yes
 
 Machine: Freescale i.MX53 Quick Start Board
-Kernel-Flavors: armmp
+Machine: Freescale MX53 LOCO Board
+Kernel-Flavors: armmp mx5
 DTB-Id: imx53-qsb.dtb
 DTB-Append-From: 3.12
 Boot-DTB-Path: /boot/dtb
@@ -142,14 +143,6 @@
 Required-Packages: u-boot-tools
 Bootloader-Sets-Incorrect-Root: no
 
-Machine: Freescale MX53 LOCO Board
-Kernel-Flavors: armmp mx5
-U-Boot-Kernel-Address: 0x70008000
-U-Boot-Initrd-Address: 0x0
-Boot-Kernel-Path: /boot/uImage
-Boot-Initrd-Path: /boot/uInitrd
-Required-Packages: u-boot-tools
-
 Machine: Genesi Efika Smartbook
 Kernel-Flavors: armmp mx5
 U-Boot-Kernel-Address: 0x90008000
diff -Nru flash-kernel-3.35/debian/changelog 
flash-kernel-3.35+deb8u1/debian/changelog
--- flash-kernel-3.35/debian/changelog  2015-04-06 23:33:25.0 +0100
+++ flash-kernel-3.35+deb8u1/debian/changelog   2015-06-17 08:22:41.0 
+0100
@@ -1,3 +1,10 @@
+flash-kernel (3.35+deb8u1) stable; urgency=medium
+
+  * Combine i.MX53 QSB and LOCO board entries, they are the same thing and the
+LOCO variant was missing DTB information. (Closes: #788782)
+
+ -- Ian Campbell   Wed, 17 Jun 2015 08:22:22 +0100
+
 flash-kernel (3.35) unstable; urgency=medium
 
   * Team upload.

-- System Information:
Debian Release: 8.0
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'unstable'), (500, 'testing'), (500, 
'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/20150702065138.18286.745.report...@dagon.hellion.org.uk



Re: Fixing Linux getrandom() in stable

2018-05-10 Thread Ian Campbell
On Thu, 2018-05-10 at 10:41 -0700, Russ Allbery wrote:

> It means that the configured timeout for which it's reasonable to wait for
> randomness is centralized in one service that can set that based on
> understanding of what's necessary in practice, and timeouts to catch other
> startup problems can remain in place for other services.  Right now, to
> have krb5-kdc wait for randomness requires extending the startup timeout
> of the service as a whole, thus potentially not diagnosing various other
> problems that might be preventing the KDC from starting unrelated to
> randomness.

Would it also mean that the user would see messages like "Waiting for
rng to be ready" instead of "Waiting for $someservice to be ready" in
the boot logs? I think it would and, if so, that seems useful in its
own right as well.

Ian.



Bug#817897: jessie-pu: package flash-kernel/3.35+deb8u2

2016-03-12 Thread Ian Campbell
On Fri, 2016-03-11 at 11:19 +0100, Uwe Kleine-König wrote:
> Package: release.debian.org
> Severity: normal
> Tags: jessie
> User: release.debian@packages.debian.org
> Usertags: pu
> 
> Hello,
> 
> I'd like to update flash-kernel in jessie with the below debdiff. The
> intention is to fix the critical bug #813995. The two other changes are
> just prerequisites for it. These changes are in unstable since
> flash-kernel 3.59.

FWIW as one of the more recently active flash-kernel maintainers I am
in favour of this, since flash-kernel is run as part of the installer
simply adding the lastest f-k with the fix to jessie-backports is not
sufficient.

3.59 entered sid on 2016-02-22 and Stretch on 2016-02-28 and there are
no reported issues.

Thanks Uwe for preparing the backport. If d-release agree I'd be happy
for you to do the actual upload as well, or else feel free to prod me
to do it.

Ian.

signature.asc
Description: This is a digitally signed message part


Bug#771905: unblock: grub2/2.02~beta2-17

2014-12-03 Thread Ian Campbell
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package grub2

Version -16 was unblocked in #770039 however a piuparts failure (#770412)
introduced in that version prevented it from propagating to testing.

In the -16 unblock Colin said:

> grub2 2.02~beta2-16 finishes off Xen host/guest integration.  GRUB has
> had most of this for a while, but the packaging work to make it possible
> to install grub-xen-host in the host, grub-xen in the guest, and then
> automatically boot GRUB in the guest wasn't present.
>
> I know this is a bit more than your standard unblock request, and indeed
> we're still waiting for this to pass through NEW.  But we're
> anticipating this being *really* useful for administrators of Xen
> hosting setups - it beats the messes that were PV-GRUB Legacy and
> PyGrub, or even keeping track of kernel versions by hand - and it would
> be fantastic to have this in jessie.

In addition -17 adds:

Related to the -16 changes:
- A fix for the piuparts failure (#770412)
- A typo fix (mismatched quotes) for the functionality introduced in -16
- A fix to update-grub which ensures that grub can actually load the Debian
  kernel under Xen (#755256). This is necessary because the Debian kernels are
  now xz compressed, which native kernels deal with internally but which the
  bootloader is required to deal with for Xen. Without this the functionality
  introduced here wouldn't actually be capable of booting Jessie without
  modifications, which would be unfortunate.

Unrelated to -16:
- A trivial typo fix (LP: #1390766) which fixes an error path in grub-mkconfig.
- Enables the "linuxefi" command for i386. This enables the potential for
  secure boot on x86 platforms with a 32-bit UEFI implementation (this
  functionality is already present for 64-bit grub.efi).

This last one is perhaps a bit controversial for an unblock request. The actual
change amounts to adding/correcting some casts to grub_addr_t in the existing
linuxefi code and enabling that module for the i386-efi build target. The
changes are all within the linuxefi code and AIUI can only have any impact if
the linuxefi command is explicitly used in the grub.cfg (which it is not by
default), so the risk of regressions to existing usecases is IMO low.

The incremental diff from -16 to -17 is below and the full -15 to -17 is
attached. These have been filtered to remove noise which git-dpm update-patches
introduces, essentiually changing the hashes in the From and index lines of any
patch which follows one which has changed. I couldn't figure out how to get
filterdiff to do anything sensible without listing each patch explicitly, so
I'm afraid I did this by hand.

I've also attached the patches-applied difference from -15 to -17 without the
debian dir since it is easier to read than the diff-of-a-diff.

Since the last version required a d-i ack I've CC-d Kibi preemptively.

diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog
--- grub2-2.02~beta2/debian/changelog   2014-11-06 13:32:03.0 +
+++ grub2-2.02~beta2/debian/changelog   2014-11-30 17:15:23.0 +
@@ -1,3 +1,20 @@
+grub2 (2.02~beta2-17) unstable; urgency=medium
+
+  [ Colin Watson ]
+  * Fix up some pointer-to-integer casts in linuxefi so that it can build on
+i386-efi.
+  * Backport from upstream:
+    - Fix typo (gettext_print instead of gettext_printf) (LP: #1390766).
+
+  [ Ian Campbell ]
+  * Correct syntax error in grub-xen-host bootstrap configuration file.
+  * Log failure when grub-install fails in postinst, rather than failing the
+entire postinst. (Closes: #770412)
+  * Arrange to insmod xzio and lzopio when booting a kernel as a Xen guest.
+(Closes: #755256)
+
+ -- Ian Campbell   Sun, 30 Nov 2014 17:15:21 +
+
 grub2 (2.02~beta2-16) unstable; urgency=medium
 
   [ Ian Campbell ]
diff -Nru grub2-2.02~beta2/debian/.git-dpm grub2-2.02~beta2/debian/.git-dpm
--- grub2-2.02~beta2/debian/.git-dpm2014-11-06 10:57:25.0 +
+++ grub2-2.02~beta2/debian/.git-dpm2014-11-30 14:20:36.0 +
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-c211ee1c228bc978ffc4b399155ebfeb7524d2e0
-c211ee1c228bc978ffc4b399155ebfeb7524d2e0
+b837a9997cb306dc9aaeb3308f05d08cef402456
+b837a9997cb306dc9aaeb3308f05d08cef402456
 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
 grub2_2.02~beta2.orig.tar.xz
diff -Nru grub2-2.02~beta2/debian/grub-xen-host_grub.cfg 
grub2-2.02~beta2/debian/grub-xen-host_grub.cfg
--- grub2-2.02~beta2/debian/grub-xen-host_grub.cfg  2014-11-06 
10:57:25.0 +
+++ grub2-2.02~beta2/debian/grub-xen-host_grub.cfg  2014-11-30 
14:20:34.0 +
@@ -1,13 +1,13 @@
 # First search for a suitable grub to chainload
 if search -s -f /boot/xen/pvboot-@@PVBOOT_ARCH@@.elf ; then

qcontrol update for Wheezy

2012-11-17 Thread Ian Campbell
Hi Release Team,

I think the fix to
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693263 would be a very
good thing to have in Wheezy. It was filed as wishlist but I'm seriously
considering upgrading it to at least serious since the systems in
question reboot 5 minutes after booting.

However when I adopted qcontrol it was very out of date so despite the
freeze I did a fair bit of work in Sid (including a new upstream version
and packaging changes) with no intention of pushing for those changes in
Wheezy (in hindsight perhaps experimental would have been a better place
to do this).

As I see it there are three options:
  * Fix in Sid and request a freeze exception for Wheezy. For
reference the current debian/changelog between Wheezy and Sid
(which doesn't include #693263 yet) is appended.
  * Fix in Sid and upload a specific fix for Wheezy via t-p-u.
  * Fix in Sid but not Wheezy.

My guess is that the release team would prefer the second or third
options but please advise.

Ian.

$ git diff v0.4.2-7 v0.4.2+svn-r40-1 -- debian/changelog
diff --git a/debian/changelog b/debian/changelog
index f64c68c..114fdd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+qcontrol (0.4.2+svn-r40-1) unstable; urgency=low
+
+  [ Ian Campbell ]
+  * New maintainer (Closes: #617749)
+  * Incorporate unreleased changes by Frans Pop:
+- Update to new upstream snapshot r31 (Closes: #513344).
+- Add an initscript to start daemon on boot.
+- Enable temperature and fan support.
+  * Switch to 3.0 (quilt) source format.
+  * Switch to debhelper 9 and dh(1).
+  * Update version in --version (Closes: #636325).
+  * Build on armhf (Closes: 645670).
+  * New upstream snapshot r40 (Closes: #600333).
+  * Bump standards version to 3.9.4 (no changes needed).
+  * Enable hardening flags.
+
+ -- Ian Campbell   Sat, 06 Oct 2012 13:45:22 +0100
+


-- 
Ian Campbell


I've been there.


signature.asc
Description: This is a digitally signed message part


Re: qcontrol update for Wheezy

2012-11-18 Thread Ian Campbell
Replying to myself rather than Christian because I forgot to say "please
CC me, I'm not subscribed to d-release" (saw this in the archives).

Christian PERRIER wrote:
> Quoting Ian Campbell (i...@hellion.org.uk):
> 
> > As I see it there are three options:
> >   * Fix in Sid and request a freeze exception for Wheezy. For
> > reference the current debian/changelog between Wheezy and Sid
> > (which doesn't include #693263 yet) is appended.
> >   * Fix in Sid and upload a specific fix for Wheezy via t-p-u.
> >   * Fix in Sid but not Wheezy.
> > 
> > My guess is that the release team would prefer the second or third
> > options but please advise.
> 
> Not wearing a RT hat but I think you can safely bet for option 2. My
> suggestion is then to prepare the update for t-p-u and then request
> for pre-approval through a bug report against release.d.o

Good advice, thanks.

Ian.
-- 
Ian Campbell


You will never know hunger.


signature.asc
Description: This is a digitally signed message part


Bug#694267: unblock: tpu: (pre-approval)qcontrol/0.4.2-7+wheezy1

2012-11-24 Thread Ian Campbell
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package qcontrol

As I mentioned in http://lists.debian.org/debian-release/2012/11/msg00716.html
I'd like to fix #693263 for Wheezy. Although the was filed as wishlist the
symptom is that the machines in question reboot after 5 minutes (i.e. generally
while you are half-way through running Debian installer). In my opinion this
makes the issue serious, on the grounds that we shouldn't release Debian with
that sort of issue, so I have upgraded it.

Unfortunately there is already stuff in sid which is not suitable for Wheezy so
I propose to upload via t-p-u. The fix has been in sid since Tuesday and has
had positive feedback from the submitter.

I would plan to upload, with the release teams permission, next weekend. At
which point the fix will have spent 10 days in sid.

The debdiff for the proposed upload is below.

NB qcontrol produces a udeb, qcontrol-udeb, in case that matters.

unblock qcontrol/0.4.2-7+wheezy1

Thanks,
Ian.

-- System Information:
Debian Release: 6.0.6
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'stable-updates'), (500, 'testing')
Architecture: armel (armv5tel)

Kernel: Linux 3.2.0-4-kirkwood
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u qcontrol-0.4.2/debian/rules qcontrol-0.4.2/debian/rules
--- qcontrol-0.4.2/debian/rules
+++ qcontrol-0.4.2/debian/rules
@@ -51,6 +51,10 @@
debian/$(PACKAGE)/etc/qcontrol; )
install -m0755 qcontrol.udeb \
debian/qcontrol-udeb/usr/sbin/qcontrol
+   install -m0755 debian/initramfs/hook \
+   debian/qcontrol/usr/share/initramfs-tools/hooks/qcontrol
+   install -m0755 debian/initramfs/init-bottom \
+   
debian/qcontrol/usr/share/initramfs-tools/scripts/init-bottom/qcontrol
# Install the following "manually" as they need permissions set
install -m0755 debian/udeb/qcommand \
debian/qcontrol-udeb/usr/sbin/
diff -u qcontrol-0.4.2/debian/qcontrol.postinst 
qcontrol-0.4.2/debian/qcontrol.postinst
--- qcontrol-0.4.2/debian/qcontrol.postinst
+++ qcontrol-0.4.2/debian/qcontrol.postinst
@@ -24,2 +24,10 @@
 
+case "$1" in
+configure)
+if [ -x /usr/sbin/update-initramfs ]; then
+update-initramfs -u
+fi
+;;
+esac
+
 #DEBHELPER#
diff -u qcontrol-0.4.2/debian/qcontrol.dirs qcontrol-0.4.2/debian/qcontrol.dirs
--- qcontrol-0.4.2/debian/qcontrol.dirs
+++ qcontrol-0.4.2/debian/qcontrol.dirs
@@ -3,0 +4,2 @@
+usr/share/initramfs-tools/hooks
+usr/share/initramfs-tools/scripts/init-bottom
diff -u qcontrol-0.4.2/debian/changelog qcontrol-0.4.2/debian/changelog
--- qcontrol-0.4.2/debian/changelog
+++ qcontrol-0.4.2/debian/changelog
@@ -1,3 +1,9 @@
+qcontrol (0.4.2-7+wheezy1) testing-proposed-updates; urgency=low
+
+  * Disable firmware watchdog on TS-219p II. (Closes: #693263)
+
+ -- Ian Campbell   Sat, 24 Nov 2012 20:48:44 +
+
 qcontrol (0.4.2-7) unstable; urgency=medium
 
   * QA upload.
diff -u qcontrol-0.4.2/debian/patches/series 
qcontrol-0.4.2/debian/patches/series
--- qcontrol-0.4.2/debian/patches/series
+++ qcontrol-0.4.2/debian/patches/series
@@ -6,0 +7 @@
+watchdog.patch
diff -u qcontrol-0.4.2/debian/udeb/debian-installer-startup.d/S99qcontrol 
qcontrol-0.4.2/debian/udeb/debian-installer-startup.d/S99qcontrol
--- qcontrol-0.4.2/debian/udeb/debian-installer-startup.d/S99qcontrol
+++ qcontrol-0.4.2/debian/udeb/debian-installer-startup.d/S99qcontrol
@@ -18,6 +18,10 @@
modprobe -q gpio_keys >/dev/null 2>&1
sleep 1
 
+   if [ X"$device" = X"QNAP TS-119/TS-219" ] then
+   qcommand watchdog off
+   fi
+
qcommand powerled on
qcommand statusled green1hz
 fi
only in patch2:
unchanged:
--- qcontrol-0.4.2.orig/debian/initramfs/init-bottom
+++ qcontrol-0.4.2/debian/initramfs/init-bottom
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Qcontrol boot script, disables watchdog
+
+PREREQ=""
+prereqs()
+{
+ echo "$PREREQ"
+}
+
+case $1 in
+prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+
+. /scripts/functions
+# Begin real processing below this line
+
+# Only needed on TS-219p II, safe to call on any TS-x19 though
+device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \
+head -n1 | sed "s/^[^:]*: //")
+case $device in
+"QNAP TS-119/TS-219") break ;;
+*)exit 0 ;;
+esac
+
+if [ ! -x "/sbin/qcontrol" ]; then
+exit 0
+fi
+
+/sbin/qcontrol --direct watchdog off || true
+
+exit 0
only in patch2:
unchanged:
--- qcontrol-0.4.2.orig/debian/initramfs/hook
+++ qcontrol-0.4.2/debian/initramfs/hook
@@ -0,0 +1,24 @@
+#!/bin/sh
+PREREQ=""
+prereqs()
+{
+ echo "$PREREQ"
+}
+
+case $1 in
+pr

Bug#694267: Updated debdiff

2012-11-25 Thread Ian Campbell
Unfortunately the previous version of the proposed update contained a
typo which meant the debian-installer aspect didn't work as expected.
I've now acquired some suitable hardware with this feature and have been
able to test more fully.

In the process I've also discovered that the TS-419P II also has a
watchdog.

I've uploaded 0.4.2+svn-r40-3 to unstable and have updated the backport
accordingly. New debdiff is attached.

Thanks,
Ian.

-- 
Ian Campbell
diff -u qcontrol-0.4.2/debian/rules qcontrol-0.4.2/debian/rules
--- qcontrol-0.4.2/debian/rules
+++ qcontrol-0.4.2/debian/rules
@@ -51,6 +51,10 @@
 			debian/$(PACKAGE)/etc/qcontrol; )
 	install -m0755 qcontrol.udeb \
 		debian/qcontrol-udeb/usr/sbin/qcontrol
+	install -m0755 debian/initramfs/hook \
+		debian/qcontrol/usr/share/initramfs-tools/hooks/qcontrol
+	install -m0755 debian/initramfs/init-bottom \
+		debian/qcontrol/usr/share/initramfs-tools/scripts/init-bottom/qcontrol
 	# Install the following "manually" as they need permissions set
 	install -m0755 debian/udeb/qcommand \
 		debian/qcontrol-udeb/usr/sbin/
@@ -58,7 +62,6 @@
 		install -m0755 debian/udeb/$$(basename $(UDEB_DIR))/* \
 			debian/qcontrol-udeb/$(UDEB_DIR); )
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
diff -u qcontrol-0.4.2/debian/qcontrol.postinst qcontrol-0.4.2/debian/qcontrol.postinst
--- qcontrol-0.4.2/debian/qcontrol.postinst
+++ qcontrol-0.4.2/debian/qcontrol.postinst
@@ -24,2 +24,10 @@
 
+case "$1" in
+configure)
+if [ -x /usr/sbin/update-initramfs ]; then
+update-initramfs -u
+fi
+;;
+esac
+
 #DEBHELPER#
diff -u qcontrol-0.4.2/debian/qcontrol.dirs qcontrol-0.4.2/debian/qcontrol.dirs
--- qcontrol-0.4.2/debian/qcontrol.dirs
+++ qcontrol-0.4.2/debian/qcontrol.dirs
@@ -3,0 +4,2 @@
+usr/share/initramfs-tools/hooks
+usr/share/initramfs-tools/scripts/init-bottom
diff -u qcontrol-0.4.2/debian/changelog qcontrol-0.4.2/debian/changelog
--- qcontrol-0.4.2/debian/changelog
+++ qcontrol-0.4.2/debian/changelog
@@ -1,3 +1,9 @@
+qcontrol (0.4.2-7+wheezy1) UNRELEASED; urgency=low
+
+  * Disable firmware watchdog on TS-219p II and TS-419p II. (Closes: #693263)
+
+ -- Ian Campbell   Sat, 17 Nov 2012 12:08:50 +
+
 qcontrol (0.4.2-7) unstable; urgency=medium
 
   * QA upload.
diff -u qcontrol-0.4.2/debian/patches/series qcontrol-0.4.2/debian/patches/series
--- qcontrol-0.4.2/debian/patches/series
+++ qcontrol-0.4.2/debian/patches/series
@@ -6,0 +7 @@
+watchdog.patch
diff -u qcontrol-0.4.2/debian/udeb/debian-installer-startup.d/S99qcontrol qcontrol-0.4.2/debian/udeb/debian-installer-startup.d/S99qcontrol
--- qcontrol-0.4.2/debian/udeb/debian-installer-startup.d/S99qcontrol
+++ qcontrol-0.4.2/debian/udeb/debian-installer-startup.d/S99qcontrol
@@ -1,16 +1,19 @@
 #! /bin/sh
 
 if qcommand -t; then
+	watchdog="no"
 	device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \
 		 head -n1 | sed "s/^[^:]*: //")
 	case $device in
 	"QNAP TS-109/TS-209")
 		mv /etc/qcontrol/ts209.lua /etc/qcontrol.conf ;;
 	"QNAP TS-119/TS-219")
+		watchdog="yes"
 		mv /etc/qcontrol/ts219.lua /etc/qcontrol.conf ;;
 	"QNAP TS-409")
 		mv /etc/qcontrol/ts409.lua /etc/qcontrol.conf ;;
 	"QNAP TS-41x")
+		watchdog="yes"
 		mv /etc/qcontrol/ts41x.lua /etc/qcontrol.conf ;;
 	esac
 	rm -rf /etc/qcontrol/
@@ -18,6 +21,10 @@
 	modprobe -q gpio_keys >/dev/null 2>&1
 	sleep 1
 
+	if [ X"$watchdog" = X"yes" ]; then
+		qcommand watchdog off
+	fi
+
 	qcommand powerled on
 	qcommand statusled green1hz
 fi
only in patch2:
unchanged:
--- qcontrol-0.4.2.orig/debian/patches/watchdog.patch
+++ qcontrol-0.4.2/debian/patches/watchdog.patch
@@ -0,0 +1,76 @@
+Index: qcontrol/ts219.c
+===
+--- qcontrol.orig/ts219.c	2012-11-25 11:40:15.0 +
 qcontrol/ts219.c	2012-11-25 11:40:15.0 +
+@@ -303,6 +303,21 @@
+ 	return 0;
+ }
+ 
++static int ts219_wdt(int argc, const char **argv)
++{
++char code = 0;
++
++if (argc != 1)
++return -1;
++if (strcmp(argv[0], "off") == 0)
++code = 0x67;
++else
++return -1;
++
++return serial_write(&code, 1);
++return 0;
++}
++
+ int ts219_init(int argc, const char **argv)
+ {
+ 	int err;
+@@ -348,6 +363,11 @@
+ 	   "Control the automatic power mechanism, options are:\n"
+ 	   "\ton\n\toff\n",
+ 	   ts219_autopower);
++	err = register_command("watchdog",
++	   "Disable the PIC watchdog",
++	   "Watchdog options are:\n"
++	   "\toff",
++	 

Bug#694267: unblock: tpu: (pre-approval)qcontrol/0.4.2-7+wheezy1

2012-12-20 Thread Ian Campbell
On Sat, 2012-11-24 at 21:37 +, Ian Campbell wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> 
> Please unblock package qcontrol

I'm not sure what the procedure here is, is there something else I'm
supposed to have done?

Should I just upload and retitle this bug s/(pre-approval)// or shall I
continue to be patient?

Thanks,
Ian.

-- 
Ian Campbell


When someone says "I want a programming language in which I need only
say what I wish done," give him a lollipop.




signature.asc
Description: This is a digitally signed message part


Bug#694267: unblock: tpu: (pre-approval)qcontrol/0.4.2-7+wheezy1

2012-12-20 Thread Ian Campbell
I replied on IRC before I saw this, I suppose I should reply here too
for the record.
On Thu, 2012-12-20 at 15:23 +0100, Cyril Brulebois wrote:
> Adam D. Barratt  (20/12/2012):
> > Is there any merit to checking the result there (i.e. actually
> > looking at err)?
> > 
> > In any case, it looks like that's the style already used for the
> > other options.

Right. There's a bunch of error handling type stuff which could be
improved upstream (which sadly seems dead :-(). I'll probably end up
taking a look at this stuff myself at some point, but that change
wouldn't be appropriate for wheezy now in any case.

>  Please go ahead; thanks.

OK. I'll hopefully get to it this weekend, if not sooner.

>  Adding the obligatory CC for
> > a d-i ack.
> 
> Looking at it briefly, two points I thought I'd mention:
>  - We have update-initramfs triggers so it looks like parts of the
>(updated) debdiff could go away.

update-initramfs itself takes care of this and defers to a trigger when
it can/should.

>  - You have a double return, which is a bit awkward. ;-)

Yeah, it's the prevailing style upstream. Pointless but harmless.
Another thing I may end up fixing.

> Besides, I'll be happy to see such a bugfix for wheezy.

Thanks,
Ian.

-- 
Ian Campbell


Each of us bears his own Hell.
-- Publius Vergilius Maro (Virgil)


signature.asc
Description: This is a digitally signed message part


Bug#697547: unblock: tpu (pre-approval) qcontrol/0.4.2-7+wheezy2

2013-01-06 Thread Ian Campbell
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package qcontrol

The fix in +wheezy1 (unblock request #694267) was incomplete because it relied
on the --direct flag which was only present in the version of qcontrol in sid.
This new upload back ports that option, which will really close #693263 693263
in testing.

unblock qcontrol/0.4.2-7+wheezy2

debdiff is:

diff -u qcontrol-0.4.2/debian/changelog qcontrol-0.4.2/debian/changelog
--- qcontrol-0.4.2/debian/changelog
+++ qcontrol-0.4.2/debian/changelog
@@ -1,3 +1,10 @@
+qcontrol (0.4.2-7+wheezy2) testing; urgency=low
+
+  * Backport --direct support, this is needed by the watchdog fix in the
+previous release. (Closes: #693263)
+
+ -- Ian Campbell   Sun, 06 Jan 2013 17:25:22 +
+
 qcontrol (0.4.2-7+wheezy1) testing; urgency=low
 
   * Disable firmware watchdog on TS-219p II and TS-419p II. (Closes: #693263)
diff -u qcontrol-0.4.2/debian/patches/series 
qcontrol-0.4.2/debian/patches/series
--- qcontrol-0.4.2/debian/patches/series
+++ qcontrol-0.4.2/debian/patches/series
@@ -7,0 +8 @@
+direct.patch
diff -u qcontrol-0.4.2/debian/udeb/qcommand qcontrol-0.4.2/debian/udeb/qcommand
--- qcontrol-0.4.2/debian/udeb/qcommand
+++ qcontrol-0.4.2/debian/udeb/qcommand
@@ -15,29 +15,6 @@
[ "$1" = "-t" ] && exit 1 || exit 0 ;;
 esac
 
-# qcontrol should not be running already; silently exit
-[ -z "$(pidof qcontrol)" ] || exit 0
-
-SOCKET=/var/run/qcontrol.sock
-
-qcontrol_start() {
-   rm -f $SOCKET
-   qcontrol -d >/dev/null &
-   # allow time to startup (read config)
-   sleep 1
-   pid=$(pidof qcontrol)
-
-   if [ "$pid" ]; then
-   if [ -S $SOCKET ]; then
-   echo $pid
-   return 0
-   else
-   kill -TERM $pid
-   fi
-   fi
-   return 1
-}
-
 # The gpio_keys character device is required with the default
 # Debian configuration file.
 test_event_dev() {
@@ -53,12 +30,7 @@
 
 test_event_dev || exit 0
-if pid=$(qcontrol_start); then
-   # Returns 1 even on success
-   qcontrol "$@" || true
 
-   # Kill the control process
-   kill -TERM $pid
-   rm -f $SOCKET
-fi
+# Returns 1 even on success (TODO: is that still true?)
+qcontrol --direct "$@" || true
 
 exit 0
only in patch2:
unchanged:
--- qcontrol-0.4.2.orig/debian/patches/direct.patch
+++ qcontrol-0.4.2/debian/patches/direct.patch
@@ -0,0 +1,15 @@
+Index: qcontrol/qcontrol.c
+===
+--- qcontrol.orig/qcontrol.c   2012-12-29 15:07:43.0 +
 qcontrol/qcontrol.c2012-12-29 15:09:49.0 +
+@@ -440,6 +440,10 @@
+   /* Startup in daemon mode */
+   pic_lua_setup(&lua);
+   return network_listen();
++  } else if (argc > 2 && strcmp(argv[1], "--direct") == 0) {
++  /* Execute a single command and terminate */
++  pic_lua_setup(&lua);
++  return run_command(argv[2], argc - 3, argv + 3);
+   } else if (argc > 1) {
+   /* Send the command to the server */
+   return network_send(argc - 1, argv + 1);



-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'stable-updates'), (500, 'unstable'), 
(500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20130106200308.9698.10283.report...@dagon.hellion.org.uk



Bug#697547: unblock: tpu (pre-approval) qcontrol/0.4.2-7+wheezy2

2013-01-11 Thread Ian Campbell
On Sun, 2013-01-06 at 22:13 +, Adam D. Barratt wrote:
> Control: tags -1 + confirmed d-i
> 
> On Sun, 2013-01-06 at 20:03 +0000, Ian Campbell wrote:
> > Please unblock package qcontrol
> > 
> > The fix in +wheezy1 (unblock request #694267) was incomplete because it 
> > relied
> > on the --direct flag which was only present in the version of qcontrol in 
> > sid.
> > This new upload back ports that option, which will really close #693263 
> > 693263
> > in testing.
> 
> Thanks. It looks okay to me, but then so did the previous
> versions. :-(

Yes :-( On the plus side I'd got some hardware with this feature now.

> Doing the CC-for-a-d-i-ack too in case there are any
> comments from that side.

I'm not sure if I'm suppose to wait for an ack from kibi too or if I
should just upload and you will unblock/reject depending on what he
says.

Ian.
-- 
Ian Campbell


Perilous to all of us are the devices of an art deeper than we ourselves
possess.
-- Gandalf the Grey [J.R.R. Tolkien, "Lord of the Rings"]


signature.asc
Description: This is a digitally signed message part


Bug#697547: unblock: tpu (pre-approval) qcontrol/0.4.2-7+wheezy2

2013-01-22 Thread Ian Campbell
On Mon, 2013-01-21 at 21:12 +0100, Cyril Brulebois wrote:
> Adam D. Barratt  (06/01/2013):
> > Thanks. It looks okay to me, but then so did the previous
> > versions. :-( Doing the CC-for-a-d-i-ack too in case there are any
> > comments from that side.
> 
> AFAICT from the comments, can't be worse than without that patch, so
> let's get that in for rc1…

Uploaded, thanks.

> Also, sorry for the lag, really.

No worries from me.

Cheers,
Ian.
-- 
Ian Campbell


"Truth never comes into the world but like a bastard, to the ignominy
of him that brought her birth."
-- Milton


signature.asc
Description: This is a digitally signed message part


Re: Linux kernel ABI bump

2014-07-19 Thread Ian Campbell
On Fri, 2014-07-18 at 17:48 +0100, Ben Hutchings wrote:
> A kernel ABI bump is needed to enable:
> 
> - [powerpc] CONFIG_PPC_TRANSACTIONAL_MEM
> - [powerpc/powerpc64] CONFIG_JUMP_LABEL
> - CONFIG_DYNAMIC_DEBUG
> 
> I propose to make these changes with the next upload to unstable.
> 
> If anyone else has an ABI-breaking change planned, we should try to get
> that done at the same time.

The fix for the arm64 aufs FTBFS issue looks likely to require an ABI
bump.

Ian.


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1405765026.27009.3.ca...@dagon.hellion.org.uk



Re: Bug#649923: [xen-hypervisor-4.0-amd64] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0, 0)

2012-01-23 Thread Ian Campbell
On Mon, 2012-01-23 at 10:15 +0100, Jan Wagner wrote:
> Hi there,
> 
> On Thursday 22 December 2011 12:26:57 Jan Wagner wrote:
> > On Monday, 28. November 2011, Ian Campbell wrote:
> > > On Fri, 2011-11-25 at 18:27 +0100, Jan Wagner wrote:
> > > > I did prepare a source package at
> > > > http://ftp.cyconet.org/debian/archive/unofficial/xen/4.0.1-5/. You can
> > > > also find some binary packages there ... I tried xen-hypervisor-4.0-
> > > > amd64_4.0.1-5_amd64.deb on stable and this fixed the issue on the
> > > > affected system. .oO(Yeah! ;)
> > > > 
> > > > Cheers and thanks a lot, Jan.
> > > 
> > > Great, thanks for testing.
> > 
> > do you plan to push that into 6.0.4?

Sorry, I dropped this in the Christmas rush. I am not the maintainer of
these packages so I have no ability to push directly into any release.

> I don't know, if the timeframe is too short for this, but is there a chance 
> to 
> get this into 6.0.4?

I suspect it is too late. Bastian what do you think? Fix is attached,
unchanged from last time.

Ian.

-- 
Ian Campbell

The Golden Rule is of no use to you whatever unless you realize it
is your move.
-- Frank Crane
>From 4ed5ce3d8f29eefebbfbfe5bde767d80fcc74e5e Mon Sep 17 00:00:00 2001
From: Ian Campbell 
Date: Tue, 29 Nov 2011 13:38:41 +
Subject: [PATCH] Fix 649923

---
 xen/debian/changelog   |7 +
 xen/debian/patches/series  |1 +
 xen/debian/patches/upstream-22375:426f3a265784 | 1080 
 3 files changed, 1088 insertions(+), 0 deletions(-)
 create mode 100644 xen/debian/patches/upstream-22375:426f3a265784

diff --git a/xen/debian/changelog b/xen/debian/changelog
index a62d772..2bcde38 100644
--- a/xen/debian/changelog
+++ b/xen/debian/changelog
@@ -1,3 +1,10 @@
+xen (4.0.1-5) UNRELEASED; urgency=low
+
+  * Backport fix to remove lowmem 1:1 mapping which fixes boot on some classes
+of machine. (Closes: #649923)
+
+ -- Ian Campbell   Fri, 25 Nov 2011 10:37:16 +
+
 xen (4.0.1-4) stable-security; urgency=low
 
   * Fix overflows and missing error checks in PV kernel loader.
diff --git a/xen/debian/patches/series b/xen/debian/patches/series
index e558b03..3da54dd 100644
--- a/xen/debian/patches/series
+++ b/xen/debian/patches/series
@@ -71,3 +71,4 @@ upstream-21413:b05fa0652463
 upstream-21461:ee088a0b5cb8-CVE-2011-1166
 upstream-21482:c2adc059e931-CVE-2011-1583
 upstream-21485:b85a9e58ec3a-CVE-2011-1898
+upstream-22375:426f3a265784
diff --git a/xen/debian/patches/upstream-22375:426f3a265784 b/xen/debian/patches/upstream-22375:426f3a265784
new file mode 100644
index 000..052c7a0
--- /dev/null
+++ b/xen/debian/patches/upstream-22375:426f3a265784
@@ -0,0 +1,1080 @@
+# HG changeset patch
+# User Keir Fraser 
+# Date 1289303389 0
+# Node ID 426f3a2657844cec77ce0043b0408b0887fafa41
+# Parent  9997a1418633c92286189b33f701ecbac2a98ccd
+x86: do away with the boot time low-memory 1:1 mapping
+
+By doing so, we're no longer restricted to be able to place all boot
+loader modules into the low 1Gb/4Gb (32-/64-bit) of memory, nor is
+there a dependency anymore on where the boot loader places the
+modules.
+
+We're also no longer restricted to copy the modules into a place below
+4Gb, nor to put them all together into a single piece of memory.
+
+Further it allows even the 32-bit Dom0 kernel to be loaded anywhere in
+physical memory (except if it doesn't support PAE-above-4G).
+
+Signed-off-by: Jan Beulich 
+
+diff -r b536ebfba183 xen/arch/x86/boot/Makefile
+--- a/xen/arch/x86/boot/Makefile	Wed Aug 25 09:22:42 2010 +0100
 b/xen/arch/x86/boot/Makefile	Fri Nov 25 10:54:50 2011 +
+@@ -4,6 +4,6 @@ head.o: reloc.S
+ 
+ BOOT_TRAMPOLINE := $(shell sed -n 's,^\#define[[:space:]]\{1\,\}BOOT_TRAMPOLINE[[:space:]]\{1\,\},,p' $(BASEDIR)/include/asm-x86/config.h)
+ %.S: %.c
+-	RELOC=$(BOOT_TRAMPOLINE) XEN_BITSPERLONG=$(patsubst x86_%,%,$(TARGET_SUBARCH)) $(MAKE) -f build32.mk $@
++	RELOC=$(BOOT_TRAMPOLINE) $(MAKE) -f build32.mk $@
+ 
+ reloc.S: $(BASEDIR)/include/asm-x86/config.h
+diff -r b536ebfba183 xen/arch/x86/boot/build32.mk
+--- a/xen/arch/x86/boot/build32.mk	Wed Aug 25 09:22:42 2010 +0100
 b/xen/arch/x86/boot/build32.mk	Fri Nov 25 10:54:50 2011 +
+@@ -19,6 +19,6 @@ CFLAGS += -Werror -fno-builtin -msoft-fl
+ 	$(LD) $(LDFLAGS_DIRECT) -N -Ttext $(RELOC) -o $@ $<
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -DXEN_BITSPERLONG=$(XEN_BITSPERLONG) -c $< -o $@
++	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ reloc.o: $(BASEDIR)/include/asm-x86/config.h
+diff -r b536ebfba183 xen/arch/x86/boot/head.S
+--- a/xen/arch/x86/boot/head.S	Wed Aug 25 09:22:42 2010 +0100
 b/xen/arch/x86/boot/head.S	Fri Nov 25 10:54:50 2011 +
+@@ -110,12 +110,15 @@ 1:  mov %edx,sym_phys(cpuid_ext_
+ /* Initialise L2 identity-map and xen page 

Re: Report from the first tests of d-i beta 1 candidate images

2012-07-17 Thread Ian Campbell
On Tue, 2012-07-17 at 14:45 +0200, Cyril Brulebois wrote:
> Cyril Brulebois  (17/07/2012):
> > some time to try kde/xfce/lxde/server installations, and possibly report
> > some more bugs. Given the images are going to be re-built at some point,
> > I think the pointer to the (known broken) images will be kept somewhere
> > in #debian-boot's topic, to avoid confusion with later builds.
> 
> Thankfully cdimage has a HEADER.html mechanism, so I've added a warning
> there, here's the URL:
>   http://cdimage.debian.org/cdimage/.wheezy_di_beta1_build1/

Installing from debian-wheezy-DI-b1-amd64-i386-netinst.iso in a Xen
guest I get:
  ┌─┌┤ [!!] Configure the package manager ├┐┐
  │ │  │
  │ │  apt configuration problem   │
  │ │ An attempt to configure apt to install additional packages from the  │
  │ │ CD failed.   │
  │ │  │
  │ │   │
  │ │  │
  └─└──┘

Looking in /var/log/syslog I see:
Jul 17 15:46:42 apt-setup: 'Debian GNU/Linux wheezy-DI-b1 _Wheezy_ - Official 
Snapshot Multi-architecture amd64/i386 NETINST #1 20120715-10:55'
Jul 17 15:46:42 apt-setup: Copying package lists...
Jul 17 15:46:42 apt-setup: ^MReading Package Indexes... 0%  ^M
Jul 17 15:46:42 apt-setup: ^MReading Package Indexes... Done^M
Jul 17 15:46:42 apt-setup: 
Jul 17 15:46:42 apt-setup: ^MReading Translation Indexes... 0%^M
Jul 17 15:46:42 apt-setup: ^MReading Translation Indexes... Done^M
Jul 17 15:46:42 apt-setup: 
Jul 17 15:46:42 apt-setup: E
Jul 17 15:46:42 apt-setup: : 
Jul 17 15:46:42 apt-setup: Failed to link /var/lib/apt/cdroms.list to 
/var/lib/apt/cdroms.list~ - link (17: File exists)
Jul 17 15:46:42 apt-setup: 
Jul 17 15:48:58 apt-setup: /usr/lib/apt-setup/generators/40cdrom backed up

/var/lib/apt doesn't seem to exist in the installer environment.
But /target/var/lib/apt does so I guess this refers to that:
~ # ls /target/var/lib/apt -l
-rw-r--r--1 root root   321 Jul 17 15:46 cdroms.list
-rw-r--r--1 root root   321 Jul 17 15:53 cdroms.list.new
-rw-r--r--1 root root   321 Jul 17 15:45 cdroms.list~
-rw-r--r--1 root root   658 Jul 17 15:46 extended_states
drwxr-xr-x3 root root 16384 Jul 17 15:53 lists
drwxr-xr-x3 root root  4096 Jul 17 15:43 mirrors
drwxr-xr-x2 root root  4096 Jun 29 14:00 periodic

This doesn't seem to be anything Xen specific here.

Ian.
-- 
Ian Campbell
Current Noise: Wolves In The Throne Room - Thuja Magus Imperium

It is not best to swap horses while crossing the river.
-- Abraham Lincoln


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1342540582.16704.9.ca...@zakaz.uk.xensource.com



Re: [Pkg-xen-devel] Bug#588839: pv-grub removed ?

2010-10-01 Thread Ian Campbell
On Sat, 2010-10-02 at 02:49 +0800, Thomas Goirand wrote: 
> Philipp Kern wrote:
> > On Fri, Oct 01, 2010 at 03:56:13PM +0800, Thomas Goirand wrote:
> >> Now, I hope someone from the release team will answer this: if we build
> >> a new xen-pv-grub package, will it be accepted by the RT, even if we are
> >> late, as the lack of pv-grub in the xen-utils can be considered a
> >> regression in Squeeze (as Lenny had the feature)?
> > 
> > AFAICS there was no pv-grub in Lenny:
> > 
> > pk...@franck:~/ftp/ftp/dists/lenny$ zgrep pv-grub Contents-amd64.gz 
> > Contents-i386.gz
> > pk...@franck:~/ftp/ftp/dists/lenny$
> > 
> > If this is the case, there's no regression.  Furthermore this is a bug of
> > severity:wishlist, so no, it would be too late for this.
> > 
> > Kind regards,
> > Philipp Kern
> 
> Considering that here:
> 
> http://wiki.xensource.com/xenwiki/PvGrub
> 
> it's written that PvGrub is replacing pygrub,

Replacing is rather strong. They serve similar purposes but its entirely
up to user preference and/or requirements which one is used. They
certainly aren't mutually exclusive or anything like that and pygrub is
not going away upstream any time soon.

> and that in Lenny (unless there's still pygrub in Squeeze,

pygrub _is_ in squeeze:
$ dpkg -S /usr/lib/xen-*/bin/pygrub
xen-utils-4.0: /usr/lib/xen-4.0/bin/pygrub

I haven't seen any suggestion, from Bastian or otherwise, that it will
be removed.

I don't believe pvgrub was in Lenny.

Ian.
-- 
Ian Campbell

TOO BAD YOU CAN'T BUY a voodoo globe so that you could make the earth spin
real fast and freak everybody out.
-- Jack Handey, The New Mexican, 1988.


signature.asc
Description: This is a digitally signed message part


Re: gcc armel status and armel architecture defaults

2014-01-13 Thread Ian Campbell
On Mon, 2014-01-13 at 05:51 +0100, Matthias Klose wrote:
> Hi,
> 
> the gcc-4.9 in experimental fails to build while the one for armhf succeeds.

For reference the logs are at:
https://buildd.debian.org/status/fetch.php?pkg=gcc-4.9&arch=armel&ver=4.9-20140111-1&stamp=1389510444

build/genpreds -c ../../src/gcc/config/arm/arm.md > tmp-constrs.h
/bin/bash: line 1: 18632 Segmentation fault  build/genpreds -c 
../../src/gcc/config/arm/arm.md > tmp-constrs.h

There seems to be some related upstream bugs
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59595
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59770

Sadly neither with a solution as yet, although the second does have a
stack trace from the fault. Both are pretty recent.

Ian.


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1389601969.6917.160.ca...@dagon.hellion.org.uk



Re: kernels in etch and compatibility with modules packages

2006-06-27 Thread Ian Campbell
On Tue, 2006-06-27 at 23:02 +0200, Adeodato Simó wrote:
> * Ian Campbell [Tue, 27 Jun 2006 20:07:59 +0100]:
> > I have unfortunately allowed the 0.6.x package to propagate into Etch,
> > which currently has a 2.6.15 kernel that the IVTV packages cannot work
> > with[0]. It seems that 2.6.16 will not be going into Etch anytime soon
> > due to the freeze[1], is that correct?
> 
> Not really, which should be good news for you. :) The kernel team has
> put work in coordination with the release team to ensure that 2.6.16
> images enter testing as soon as possible. Now, there are in sid two
> source packages, linux-2.6 (providing .17) and linux-2.6.16, which is
> expected to enter testing soon:
> 
>   http://bjorn.haxx.se/debian/testing.pl?package=linux-2.6.16

Excellent news! Thanks for the info.

> > However, does anyone know a more elegant way than filing
> > an RC bug to stop the 0.6.x package propagating again (and the same
> > problem occurring in the 2.6.17/0.7.x time-frame)? I don't think there
> > is a kernel package I can sensibly depend on since people may build from
> > upstream source. Would a build-depends make sense, even though it isn't
> > strictly true?
> 
> The RC bug is the way to go. As you say, you can't add a dependency, and
> build-depends would not do it, since propagation to testing does not
> take them into account, only dependencies.

I didn't know build-depends didn't count. RC bug it is then, thanks.

Ian.
-- 
Ian Campbell

(null cookie; hope that's ok)


signature.asc
Description: This is a digitally signed message part


Re: [Pkg-xen-devel] Re: Xen is affected by the trademark desease

2006-10-06 Thread Ian Campbell
On Fri, 2006-10-06 at 13:24 +0200, Bastian Blank wrote:
> On Thu, Oct 05, 2006 at 08:58:10AM -0600, Steve Langasek wrote:
> > In the case of firefox, we're not distributing code identical to something
> > that's been made available upstream under the name "firefox", we are
> > patching the code with patches that have not been approved by upstream.  If
> > we were distributing a package that directly corresponded to upstream code
> > (even to an arbitrary CVS tag/revision), I would argue that we wouldn't
> > *need* a trademark license from MoFo to distribute it under that name.
> 
> We currently patch the buildsystem, some helper modules, to support
> more than one installed version, and the default config.

Is any of that worth contributing back upstream?

Ian.

-- 
Ian Campbell

"Never make any mistaeks."
(Anonymous, in a mail discussion about to a kernel bug report.)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Please allow ivtv to propagate to testing (Was Etch frozen!)

2006-12-11 Thread Ian Campbell
On Mon, 2006-12-11 at 11:08 +0100, Andreas Barth wrote:
>   Etch is now frozen!   Wheee!!!

Good news!

>   - If you have a package that needs updating, *please* don't forget to
> contact us.  *Don't expect us to find out about it on our own*.
> Putting a comment in the changelog is not contacting the release
> team. :)

Ivtv 0.8.0-2 was due to propagate in today. It was waiting for the
2.6.18 kernel to enter testing due to an unfortunately tight kernel
version dependency in the driver. I closed the RC bug (#397831) which
was enforcing this yesterday when I saw the kernel had gone in.

This is rather important since the 0.7.x version of IVTV in testing will
not work with the 2.6.18 kernel.

Cheers,
Ian.
-- 
Ian Campbell

At work, the authority of a person is inversely proportional to the
number of pens that person is carrying.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: Please allow ivtv to propagate to testing (Was Etch frozen!)

2006-12-11 Thread Ian Campbell
On Mon, 2006-12-11 at 15:28 +0100, Andreas Barth wrote:
> * Ian Campbell ([EMAIL PROTECTED]) [061211 15:24]:
> > Ivtv 0.8.0-2 was due to propagate in today. It was waiting for the
> > 2.6.18 kernel to enter testing due to an unfortunately tight kernel
> > version dependency in the driver. I closed the RC bug (#397831) which
> > was enforcing this yesterday when I saw the kernel had gone in.
> > 
> > This is rather important since the 0.7.x version of IVTV in testing will
> > not work with the 2.6.18 kernel.
> 
> This has already happened yesterday:
>   ivtv |   ivtv |0.8.1-2 | testing/contrib | source
>   ivtv |   ivtv |0.8.1-2 | unstable/contrib | source

Apologies for the noise. http://packages.qa.debian.org/i/ivtv.html is
just out of date.

Cheers,
Ian.
-- 
Ian Campbell
Current Noise: The Crown - No Tomorrow

"How do I love thee?  My accumulator overflows."


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: [Pkg-mythtv-maintainers] Re: upstream bug fix for ivtv - options

2007-01-06 Thread Ian Campbell
On Sat, 2007-01-06 at 14:11 -0800, Steve Langasek wrote:
> But I also don't understand why these bugs should be considered "important"
> to be let into etch?  Graceful handling of tveeproms isn't all that
> important.  What's the importance of the busy waiting loop fix?

The busy wait loop thing fixes a problem with excessive CPU load when
using a PVR-350 framebuffer output and mythtv. The upstream thread is
http://ivtvdriver.org/pipermail/ivtv-devel/2006-December/003803.html but
in summary the load was 2-3x what it should be with one of these cards.
People who were suffering the problem report loads going from 50-60%
down to negligible amounts with the fix.

The EEPROM fix makes the driver compatible with more cards. Possibly
non-Hauppauge ones using the same chipset, I'm not too sure since info
on this one is a bit thin.

Personally I've not come across either of the two problems and as Mark
said there haven't been any Debian bug reports about them. That said I
do think the fixes are worth having in Etch since they do fix things for
some people and seem quite low risk to me.

Ian.

-- 
Ian Campbell

MMM-MM!!  So THIS is BIO-NEBULATION!


signature.asc
Description: This is a digitally signed message part


Re: [Pkg-mythtv-maintainers] Re: upstream bug fix for ivtv - options

2007-01-10 Thread Ian Campbell
On Tue, 2007-01-09 at 05:03 -0800, Steve Langasek wrote: 
> On Sat, Jan 06, 2007 at 11:05:46PM +0000, Ian Campbell wrote:
> > On Sat, 2007-01-06 at 14:11 -0800, Steve Langasek wrote:
> > > But I also don't understand why these bugs should be considered 
> > > "important"
> > > to be let into etch?  Graceful handling of tveeproms isn't all that
> > > important.  What's the importance of the busy waiting loop fix?
> 
> > The busy wait loop thing fixes a problem with excessive CPU load when
> > using a PVR-350 framebuffer output and mythtv. The upstream thread is
> > http://ivtvdriver.org/pipermail/ivtv-devel/2006-December/003803.html but
> > in summary the load was 2-3x what it should be with one of these cards.
> > People who were suffering the problem report loads going from 50-60%
> > down to negligible amounts with the fix.
> 
> Oh, well, that could explain some symptoms that I've seen personally, so I
> guess I can be persuaded that this should be allowed into etch. ;)

;-)

> Ok, unblocked.

Thanks.

Ian.
.
-- 
Ian Campbell

What is the robbing of a bank compared to the founding of a bank?
-- Bertold Brecht


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]