]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/log
mirror_ubuntu-zesty-kernel.git
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove cpia2 files duplicated in linux-firmware
Tim Gardner [Fri, 3 Aug 2012 18:40:47 +0000 (12:40 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove cpia2 files duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove av7110 files duplicated in linux-firmware
Tim Gardner [Fri, 3 Aug 2012 16:42:33 +0000 (10:42 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove av7110 files duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove ambassador files duplicated in linux-firmware
Tim Gardner [Fri, 3 Aug 2012 16:38:52 +0000 (10:38 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove ambassador files duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove advansys files duplicated in linux-firmware
Tim Gardner [Fri, 3 Aug 2012 16:31:45 +0000 (10:31 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove advansys files duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove adaptec files duplicated in linux-firmware
Tim Gardner [Fri, 3 Aug 2012 16:19:39 +0000 (10:19 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove adaptec files duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove ti_usb_3410_5052 duplicated in linux-firmware
Tim Gardner [Fri, 3 Aug 2012 16:01:37 +0000 (10:01 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove ti_usb_3410_5052 duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove edgeport files duplicated in linux-firmware
Tim Gardner [Wed, 1 Aug 2012 19:56:39 +0000 (13:56 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove edgeport files duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove kaweth files duplicated in linux-firmware
Tim Gardner [Wed, 1 Aug 2012 18:53:54 +0000 (12:53 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove kaweth files duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Remove ess files duplicated in linux-firmware
Tim Gardner [Wed, 1 Aug 2012 18:51:10 +0000 (12:51 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Remove ess files duplicated in linux-firmware

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) Remove redundant keyspan_pda firmware
Tim Gardner [Fri, 20 Jul 2012 22:49:24 +0000 (16:49 -0600)]
UBUNTU: SAUCE: (no-up) Remove redundant keyspan_pda firmware

This firmware is already in the linux-firmware package

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) Remove redundant yamaha/ds1 firmware
Tim Gardner [Fri, 20 Jul 2012 22:46:59 +0000 (16:46 -0600)]
UBUNTU: SAUCE: (no-up) Remove redundant yamaha/ds1 firmware

This firmware is already in the linux-firmware package.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) Remove redundant ositech/Xilinx7OD firmware
Tim Gardner [Fri, 20 Jul 2012 22:25:16 +0000 (16:25 -0600)]
UBUNTU: SAUCE: (no-up) Remove redundant ositech/Xilinx7OD firmware

This firmware is already in the linux-firmware package.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) Remove redundant ttusb-budget firmware
Tim Gardner [Fri, 20 Jul 2012 22:03:35 +0000 (16:03 -0600)]
UBUNTU: SAUCE: (no-up) Remove redundant ttusb-budget firmware

This firmware is already in the linux-firmware package.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) Remove redundant cis firmware
Tim Gardner [Fri, 20 Jul 2012 21:40:43 +0000 (15:40 -0600)]
UBUNTU: SAUCE: (no-up) Remove redundant cis firmware

This firmware is already in the linux-firmware package.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) firmware: Update bnx2x to current firmware version 7.2.51
Tim Gardner [Thu, 19 Jul 2012 19:18:06 +0000 (13:18 -0600)]
UBUNTU: SAUCE: (no-up) firmware: Update bnx2x to current firmware version 7.2.51

required as boot essential firmware. Drop this after Raring since v3.9
already requires 7.8.17

Cc: Eilon Greenstein <eilong@broadcom.com>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) kconfig: in debug mode some 0 length message prints occur
Andy Whitcroft [Thu, 3 May 2012 15:01:39 +0000 (16:01 +0100)]
UBUNTU: SAUCE: (no-up) kconfig: in debug mode some 0 length message prints occur

Has no real kernel impact, so continue to carry.

When we enable the zconfdump() debugging we see assertion failures
attempting to print the config.  Convert this into a noop.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) Allow filtering of cpufreq drivers
Tim Gardner [Tue, 24 Apr 2012 17:47:18 +0000 (11:47 -0600)]
UBUNTU: SAUCE: (no-up) Allow filtering of cpufreq drivers

Harmless patch that allows k8 powernow machines to boot. Carry until
conflict.

BugLink: http://bugs.launchpad.net/bugs/984288
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Herton Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) tools/hv: add basic manual pages
Andy Whitcroft [Fri, 6 Apr 2012 17:52:42 +0000 (18:52 +0100)]
UBUNTU: SAUCE: (no-up) tools/hv: add basic manual pages

BugLink: http://bugs.launchpad.net/bugs/977246
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) elide some ioctl warnings which are known benign
Andy Whitcroft [Tue, 3 Apr 2012 10:42:41 +0000 (11:42 +0100)]
UBUNTU: SAUCE: (no-up) elide some ioctl warnings which are known benign

BugLink: http://bugs.launchpad.net/bugs/972355
We have been seeing increasing reports of scarey ioctl messages in
dmesg, such as the below often in bulk:

    mdadm: sending ioctl 1261 to a partition!
    mdadm: sending ioctl 800c0910 to a partition!

Looking at the upstream discussions these are all benign and can be safely
suppressed.  This patch is based on some discussions at the link below,
on some work SUSE did in this area.  This is not suitable for upstreaming
as we need some refactoring to fix the 32bit compat ioctl mess.

Link: http://www.spinics.net/lists/raid/msg37770.html
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) Input: synaptics - add second variant of two-button clickpad
Chase Douglas [Fri, 24 Feb 2012 23:05:50 +0000 (15:05 -0800)]
UBUNTU: SAUCE: (no-up) Input: synaptics - add second variant of two-button clickpad

This is necessary for clickpad detection of Synaptics trackpads in Dell
Mini 10 series of laptops.

no-up comments: Keep both, so long as they continue to apply cleanly.
The patches apply only to a couple of old Dell minis, and Dell has said
they don't intend to use those touchpads again. Upstreaming these
patches stalled due to lack of information/response, and continuing to
pursue it probably isn't worth the effort, so they can be marked no-up.
There's no harm in keeping the patches, but if they become a problem
they can be dropped.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Latitude E6220 use reboot=pci
Leann Ogasawara [Fri, 26 Aug 2011 14:30:16 +0000 (07:30 -0700)]
UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Latitude E6220 use reboot=pci

BugLink: http://bugs.launchpad.net/bugs/838402
The Dell Latitude E6220 doesn't reboot unless reboot=pci is set.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Optiplex 990 use reboot=pci
Leann Ogasawara [Wed, 14 Sep 2011 18:27:20 +0000 (11:27 -0700)]
UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Optiplex 990 use reboot=pci

BugLink: http://bugs.launchpad.net/bugs/768039
The Dell Optiplex 990 doesn't reboot unless reboot=pci is set.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Optiplex 790 use reboot=pci
Leann Ogasawara [Fri, 9 Sep 2011 20:23:51 +0000 (13:23 -0700)]
UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Optiplex 790 use reboot=pci

BugLink: http://bugs.launchpad.net/bugs/818933
The Dell Optiplex 790 doesn't reboot unless reboot=pci is set.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Latitude E6520 use reboot=pci
Leann Ogasawara [Wed, 31 Aug 2011 17:25:24 +0000 (10:25 -0700)]
UBUNTU: SAUCE: (no-up) x86: reboot: Make Dell Latitude E6520 use reboot=pci

The Dell Latitude E6520 doesn't reboot unless reboot=pci is set.

BugLink: http://bugs.launchpad.net/bugs/833705
Cc: <stable@kernel.org>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) add support for installed header files to ubuntu directory
Andy Whitcroft [Fri, 3 Dec 2010 09:51:33 +0000 (09:51 +0000)]
UBUNTU: SAUCE: (no-up) add support for installed header files to ubuntu directory

BugLink: http://bugs.launchpad.net/bugs/684666
We need the aufs headers in the linux-libc-headers, add support for
including files from the ubuntu include directory.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) cdrom -- default to not locking the tray when in use
Andy Whitcroft [Thu, 11 Mar 2010 10:33:36 +0000 (10:33 +0000)]
UBUNTU: SAUCE: (no-up) cdrom -- default to not locking the tray when in use

BugLink: http://bugs.launchpad.net/bugs/397734
It seems that users are have a high expectation that the eject button
on their CDROM drive will eject the disk regardless of whether it is in
use or not.  To this end we are now changing the default LOCK mode for
mounted CDROMS to 0 to allow ejects.  This however does not handle the
direct open cases like music and video players.  From the launchpad bug
commentary:

    So, according to the upstream discussion David Zeuthen recommended
    to just not lock CD-ROM trays by default. Kernel/userspace already
    handles prematurely removed USB storage devices reasonably, and with
    read-only devices like CD-ROMs it is even less of an issue. So we
    should just set /proc/sys/dev/cdrom/lock to 0 by default.

Note that we still will have the drive mounted after the eject.  There is a
media change uevent generated and this will be used to trigger the unmount
of the drive in udisks.  The burner software will also have to be looked
at to ensure they are explicitly locking the drive closed during the burn.
This will all be handled under the bug above.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) nbd: Change default partitions per device to 15
Scott James Remnant [Mon, 16 Mar 2009 15:03:07 +0000 (15:03 +0000)]
UBUNTU: SAUCE: (no-up) nbd: Change default partitions per device to 15

This was previously changed by using an "options" line in a modprobe.d
file, however that practice is now deprecated.  This is because module
names, option names, their values and even their current defaults can
all change inside the kernel and module-init-tools has never been kept
in sync.

In addition, changing the kernel means that the option change will apply
if the module is built in by users or the OEM team.

Bug: #342563

Signed-off-by: Scott James Remnant <scott@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: SAUCE: (no-up) version: Implement version_signature proc file.
Andy Whitcroft [Thu, 27 Nov 2008 19:12:07 +0000 (19:12 +0000)]
UBUNTU: SAUCE: (no-up) version: Implement version_signature proc file.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardener <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] Use src_pkg_name when constructing udeb control files
Tim Gardner [Thu, 8 Sep 2016 19:23:57 +0000 (13:23 -0600)]
UBUNTU: [Debian] Use src_pkg_name when constructing udeb control files

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] avoid duplicate CVE numbers in changelog
Andy Whitcroft [Tue, 19 Jul 2016 15:20:25 +0000 (16:20 +0100)]
UBUNTU: [Debian] avoid duplicate CVE numbers in changelog

BugLink: http://bugs.launchpad.net/bugs/1604344
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
7 years agoUBUNTU: [Debian] use CVE numbers in changelog
Andy Whitcroft [Tue, 19 Jul 2016 10:35:46 +0000 (11:35 +0100)]
UBUNTU: [Debian] use CVE numbers in changelog

BugLink: http://bugs.launchpad.net/bugs/1604344
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
7 years agoUBUNTU: [debian] getabis: Fix inconsistent compiler versions check
Kamal Mostafa [Mon, 23 May 2016 17:29:57 +0000 (10:29 -0700)]
UBUNTU: [debian] getabis: Fix inconsistent compiler versions check

BugLink: http://bugs.launchpad.net/bugs/1584890
Make the "WARNING: inconsistent compiler versions" check actually do
something useful by restricting it to check just the source package
version number (since the whole version string now contains e.g.
"Ubuntu/Linaro", "Ubuntu/IBM")

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
7 years agoUBUNTU: [debian] getabis: Only git add $abidir if running in local repo
Kamal Mostafa [Mon, 23 May 2016 17:29:56 +0000 (10:29 -0700)]
UBUNTU: [debian] getabis: Only git add $abidir if running in local repo

BugLink: http://bugs.launchpad.net/bugs/1584890
Fixes bogus error when run on a remote host, as via maint-startnewrelease:
    fatal: Not a git repository (or any of the parent directories): .git

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
7 years agoUBUNTU: [Debian] Added tristate.sh
Tim Gardner [Tue, 17 May 2016 20:03:46 +0000 (14:03 -0600)]
UBUNTU: [Debian] Added tristate.sh

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] zfs: transform symlink into referent file/dir
Tim Gardner [Tue, 17 May 2016 17:13:04 +0000 (11:13 -0600)]
UBUNTU: [Debian] zfs: transform symlink into referent file/dir

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] disable zfs module checks when cross-compiling
Andy Whitcroft [Thu, 12 May 2016 16:32:22 +0000 (17:32 +0100)]
UBUNTU: [Debian] disable zfs module checks when cross-compiling

When we cross-compile we have to turn off the inbuilt zfs modules.
When doing this we also need to allow the modules so produced to go
missing in this build while still checking the remainder of the modules.

BugLink: http://bugs.launchpad.net/bugs/1581127
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] kernel-wedge -- switch to explicit versions
Andy Whitcroft [Tue, 22 Mar 2016 17:39:51 +0000 (17:39 +0000)]
UBUNTU: [Debian] kernel-wedge -- switch to explicit versions

Pass the current ABI number to kernel-wedge so that it can
imply the correct versions.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] d-i -- move to current kernel-wedge configuration form
Andy Whitcroft [Tue, 22 Mar 2016 10:51:30 +0000 (10:51 +0000)]
UBUNTU: [Debian] d-i -- move to current kernel-wedge configuration form

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] update source options
Kamal Mostafa [Sun, 24 Apr 2016 19:12:29 +0000 (12:12 -0700)]
UBUNTU: [Debian] update source options

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
7 years agoUBUNTU: [Debian] autoreconstruct -- generate extend-diff-ignore for links
Andy Whitcroft [Sun, 24 Apr 2016 18:52:57 +0000 (19:52 +0100)]
UBUNTU: [Debian] autoreconstruct -- generate extend-diff-ignore for links

BugLink: http://bugs.launchpad.net/bugs/1574362
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] fix linux_tools when cross-compiling
David Leonard [Wed, 30 Mar 2016 01:38:21 +0000 (11:38 +1000)]
UBUNTU: [Debian] fix linux_tools when cross-compiling

Fixed invocation of dh_shlibdeps when cross-compiling with
do_linux_tools=true.
Without being told where to find the crossdev libs, dh_shlibdeps
will emit these warnings and fail the linux-tools package:

  Debug: binary-acm7xxx
  ...
  dh_shlibdeps -plinux-headers-4.4.0-15-generic
  arm-linux-gnueabihf-objdump: .../asn1_compiler: File format not recognized
  arm-linux-gnueabihf-objdump: .../extract-cert: File format not recognized
  ...

For example:

archtriple=arm-linux-gnueabihf
         flavour=generic
         dpkg-architecture -t $archtriple -c fakeroot \
                debian/rules \
                binary-$flavour binary-perarch \
                AUTOBUILD=true \
                abi_suffix= \
                do_linux_tools=true \
                do_tools=true \
                do_tools_usbip=false \
                do_tools_cpupower=false \
                do_tools_perf=true \
                do_tools_x86=false

Signed-off-by: David Leonard <david.leonard@opengear.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] cpupower uses non-standard CROSS
Tim Gardner [Thu, 31 Mar 2016 12:43:53 +0000 (06:43 -0600)]
UBUNTU: [Debian] cpupower uses non-standard CROSS

BugLink: http://bugs.launchpad.net/bugs/1564206
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] zfs -- handle rprovides via dpkg-gencontrol
Andy Whitcroft [Thu, 10 Mar 2016 16:07:35 +0000 (16:07 +0000)]
UBUNTU: [Debian] zfs -- handle rprovides via dpkg-gencontrol

BugLink: http://bugs.launchpad.net/bugs/1558871
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] Remove generated intermediate files on clean
Tim Gardner [Tue, 22 Mar 2016 13:04:20 +0000 (07:04 -0600)]
UBUNTU: [Debian] Remove generated intermediate files on clean

BugLink: http://bugs.launchpad.net/bugs/1560445
Remove these files on clean so they do not get included in the
source package.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] Silence the reconstruct script
Tim Gardner [Tue, 22 Mar 2016 12:58:35 +0000 (06:58 -0600)]
UBUNTU: [Debian] Silence the reconstruct script

The reconstruct script is long enough that it overwhelms
any other output from a clean operation (and is largely noise
anyway).

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] git-ubuntu-log -- git log output is UTF-8
Andy Whitcroft [Fri, 18 Mar 2016 14:20:56 +0000 (14:20 +0000)]
UBUNTU: [Debian] git-ubuntu-log -- git log output is UTF-8

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] git-ubuntu-log -- prevent bug references being split
Andy Whitcroft [Fri, 18 Mar 2016 02:24:41 +0000 (02:24 +0000)]
UBUNTU: [Debian] git-ubuntu-log -- prevent bug references being split

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] reconstruct -- update when inserting final changes
Andy Whitcroft [Thu, 10 Mar 2016 10:32:46 +0000 (10:32 +0000)]
UBUNTU: [Debian] reconstruct -- update when inserting final changes

BugLink: http://bugs.launchpad.net/bugs/1555543
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] reconstruct -- automatically reconstruct against base tag
Andy Whitcroft [Thu, 10 Mar 2016 10:26:37 +0000 (10:26 +0000)]
UBUNTU: [Debian] reconstruct -- automatically reconstruct against base tag

BugLink: http://bugs.launchpad.net/bugs/1555543
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] supply zfs dkms Provides: based on do_zfs
Andy Whitcroft [Fri, 26 Feb 2016 20:38:49 +0000 (20:38 +0000)]
UBUNTU: [Debian] supply zfs dkms Provides: based on do_zfs

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] perf -- build in the context of the full generated local headers
Andy Whitcroft [Sat, 27 Feb 2016 11:28:02 +0000 (11:28 +0000)]
UBUNTU: [Debian] perf -- build in the context of the full generated local headers

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] git-ubuntu-log -- ensure we get the last commit
Andy Whitcroft [Fri, 26 Feb 2016 10:53:48 +0000 (10:53 +0000)]
UBUNTU: [Debian] git-ubuntu-log -- ensure we get the last commit

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] git-ubuntu-log -- wrap long bug and commit titles
Andy Whitcroft [Wed, 24 Feb 2016 22:25:23 +0000 (22:25 +0000)]
UBUNTU: [Debian] git-ubuntu-log -- wrap long bug and commit titles

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] git-ubuntu-log -- handle invalid or private bugs
Andy Whitcroft [Mon, 22 Feb 2016 19:47:02 +0000 (19:47 +0000)]
UBUNTU: [Debian] git-ubuntu-log -- handle invalid or private bugs

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] git-ubuntu-log -- output should be utf-8
Andy Whitcroft [Mon, 22 Feb 2016 19:44:47 +0000 (19:44 +0000)]
UBUNTU: [Debian] git-ubuntu-log -- output should be utf-8

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] postinst -- handle recreating symlinks when a real file is present
Andy Whitcroft [Mon, 22 Feb 2016 19:18:02 +0000 (19:18 +0000)]
UBUNTU: [Debian] postinst -- handle recreating symlinks when a real file is present

BugLink: http://bugs.launchpad.net/bugs/1536810
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] hv: hv_set_ifconfig -- fix numerous parameter handling issues
Andy Whitcroft [Tue, 9 Feb 2016 14:07:06 +0000 (14:07 +0000)]
UBUNTU: [Debian] hv: hv_set_ifconfig -- fix numerous parameter handling issues

Fix a number of KVP parameter parsing issues:

1) we should not be separating the prefix and instance numbers with an '_',
2) IPADDR/NETMASK instance 0 does have a suffix which we do not provide,
3) GATEWAY instance 0 is inconsistant,
4) IPv6 should be configured whether IPv4 is DHCP or not, and
5) DHCP mode is selected via BOOTPROTO=dhcp not DHCP=yes.

BugLink: http://bugs.launchpad.net/bugs/1540586
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] hv: hv_set_ifconfig -- switch to approved indentation
Andy Whitcroft [Tue, 9 Feb 2016 14:03:05 +0000 (14:03 +0000)]
UBUNTU: [Debian] hv: hv_set_ifconfig -- switch to approved indentation

BugLink: http://bugs.launchpad.net/bugs/1540586
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] git-ubuntu-log -- fix empty section formatting
Andy Whitcroft [Fri, 5 Feb 2016 17:39:13 +0000 (17:39 +0000)]
UBUNTU: [Debian] git-ubuntu-log -- fix empty section formatting

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] git-ubuntu-log -- switch to bug order
Andy Whitcroft [Fri, 5 Feb 2016 17:39:13 +0000 (17:39 +0000)]
UBUNTU: [Debian] git-ubuntu-log -- switch to bug order

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] update spl/zfs version
Tim Gardner [Thu, 4 Feb 2016 14:24:12 +0000 (07:24 -0700)]
UBUNTU: [Debian] update spl/zfs version

BugLink: http://bugs.launchpad.net/bugs/1542296
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] postinst -- detect symlinks correctly
Andy Whitcroft [Sun, 31 Jan 2016 14:30:07 +0000 (14:30 +0000)]
UBUNTU: [Debian] postinst -- detect symlinks correctly

BugLink: http://bugs.launchpad.net/bugs/1536810
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] hv: hv_set_ifconfig -- convert to python3
Andy Whitcroft [Thu, 28 Jan 2016 12:03:00 +0000 (12:03 +0000)]
UBUNTU: [Debian] hv: hv_set_ifconfig -- convert to python3

From 15.10 onwards python2 is no longer the default python and is no longer
installed by default.  Switch to python3 which is.  This delta is much
larger than the nominal changes as inconsistent spacing is now an error.
I have also corrected the use of loose strings as comments.

BugLink: http://bugs.launchpad.net/bugs/1506521
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] Install spl/zfs under the kernel modules directory
Tim Gardner [Fri, 15 Jan 2016 20:43:32 +0000 (13:43 -0700)]
UBUNTU: [Debian] Install spl/zfs under the kernel modules directory

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] gcc-multilib does not exist on ppc64el
Andy Whitcroft [Thu, 12 Nov 2015 10:13:07 +0000 (10:13 +0000)]
UBUNTU: [Debian] gcc-multilib does not exist on ppc64el

We have a hard dependency on gcc-multilib which is not available on
ppc64el.  Drop this dependancy by making it arch conditional.

BugLink: http://bugs.launchpad.net/bugs/1515541
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] Ignore spl/zfs symlinks
Tim Gardner [Mon, 11 Jan 2016 13:52:11 +0000 (06:52 -0700)]
UBUNTU: [Debian] Ignore spl/zfs symlinks

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] config-check and prepare using ${DEBIAN}/config/annotations
Tim Gardner [Tue, 6 Oct 2015 16:07:03 +0000 (10:07 -0600)]
UBUNTU: [Debian] config-check and prepare using ${DEBIAN}/config/annotations

Annotations are unique to the derivative. Therefore, use annotations
found in the derivative config directory.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
(cherry picked from commit 4f92f80963c358c9716e70d912449a7c2a5808aa)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
7 years agoUBUNTU: [Debian] Disable udebs when cross compiling
Tim Gardner [Sun, 29 Nov 2015 03:38:57 +0000 (20:38 -0700)]
UBUNTU: [Debian] Disable udebs when cross compiling

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] Disable SPL/ZFS for cross compiling -- redux
Andy Whitcroft [Wed, 25 Nov 2015 11:23:31 +0000 (11:23 +0000)]
UBUNTU: [Debian] Disable SPL/ZFS for cross compiling -- redux

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] Disable SPL/ZFS for cross compiling
Tim Gardner [Thu, 12 Nov 2015 23:37:17 +0000 (16:37 -0700)]
UBUNTU: [Debian] Disable SPL/ZFS for cross compiling

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] s390x -- add architecture to kernelconfig
Andy Whitcroft [Mon, 24 Aug 2015 15:52:25 +0000 (16:52 +0100)]
UBUNTU: [Debian] s390x -- add architecture to kernelconfig

BugLink: http://bugs.launchpad.net/bugs/1488653
Signed-off-by: Andy Whitcroft <apw@canonical.com>
(cherry picked from commit 019499429e25c5845a9ff9019819dc91010374fd)
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] config-check -- handle V2 annotations format
Andy Whitcroft [Mon, 28 Sep 2015 15:21:49 +0000 (16:21 +0100)]
UBUNTU: [Debian] config-check -- handle V2 annotations format

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] config-check -- accumulate multi-line annotations correctly
Andy Whitcroft [Fri, 25 Sep 2015 20:09:07 +0000 (21:09 +0100)]
UBUNTU: [Debian] config-check -- accumulate multi-line annotations correctly

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] module-inclusion -- add dependency inclusion for a list
Andy Whitcroft [Thu, 26 Mar 2015 15:54:05 +0000 (15:54 +0000)]
UBUNTU: [Debian] module-inclusion -- add dependency inclusion for a list

When adding a module via an inclusion list, add any specific dependencies
it lists.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] config-check -- improve syntax diagnostics
Andy Whitcroft [Mon, 7 Sep 2015 17:14:39 +0000 (18:14 +0100)]
UBUNTU: [Debian] config-check -- improve syntax diagnostics

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] add feature interlock with mainline builds
Andy Whitcroft [Mon, 26 Oct 2015 09:09:23 +0000 (09:09 +0000)]
UBUNTU: [Debian] add feature interlock with mainline builds

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] update-zfs.sh: Allow environment variable overrides
Tim Gardner [Wed, 28 Oct 2015 14:39:16 +0000 (08:39 -0600)]
UBUNTU: [Debian] update-zfs.sh: Allow environment variable overrides

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] Added script to update SPL/ZFS module from archive package
Tim Gardner [Sat, 24 Oct 2015 14:23:27 +0000 (08:23 -0600)]
UBUNTU: [Debian] Added script to update SPL/ZFS module from archive package

BugLink: http://bugs.launchpad.net/bugs/1509881
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] Added SPL/ZFS build rules
Tim Gardner [Sat, 24 Oct 2015 14:31:31 +0000 (08:31 -0600)]
UBUNTU: [Debian] Added SPL/ZFS build rules

BugLink: http://bugs.launchpad.net/bugs/1509881
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] Update to new signing key type and location
Tim Gardner [Wed, 21 Oct 2015 17:14:28 +0000 (11:14 -0600)]
UBUNTU: [Debian] Update to new signing key type and location

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] sign-file is now compiled
Tim Gardner [Wed, 21 Oct 2015 15:24:46 +0000 (09:24 -0600)]
UBUNTU: [Debian] sign-file is now compiled

Since sign-file was originally a script, the reference to it never failed. Now that
it is compiled, the executable lives in the build directory.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] rebuild should only trigger for non-linux packages
Andy Whitcroft [Wed, 23 Sep 2015 10:54:24 +0000 (11:54 +0100)]
UBUNTU: [Debian] rebuild should only trigger for non-linux packages

BugLink: http://bugs.launchpad.net/bugs/1498862
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] ubuntu: vbox -- elide the new symlinks and reconstruct on clean
Andy Whitcroft [Mon, 2 Mar 2015 19:02:07 +0000 (19:02 +0000)]
UBUNTU: [Debian] ubuntu: vbox -- elide the new symlinks and reconstruct on clean

BugLink: http://bugs.launchpad.net/bugs/1426113
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] aufs: fix update script to allow local mirror
Andy Whitcroft [Thu, 30 Jul 2015 15:46:47 +0000 (16:46 +0100)]
UBUNTU: [Debian] aufs: fix update script to allow local mirror

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] control -- prepare for new kernel-wedge semantics
Andy Whitcroft [Thu, 3 Sep 2015 21:44:08 +0000 (22:44 +0100)]
UBUNTU: [Debian] control -- prepare for new kernel-wedge semantics

We have been carrying a nastly little patch for kernel-wedge to cope with
the fact we use control.stub.  But it is simpler to just go with the flow
and emit the stub by hand.  Do this in such a way we keep a fake
debian/control.stub such that we will work with either Debian or Ubuntu
kernel-wedge.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] standardise on stage1 for the bootstrap stage in line with debian
Andy Whitcroft [Tue, 1 Sep 2015 15:46:21 +0000 (16:46 +0100)]
UBUNTU: [Debian] standardise on stage1 for the bootstrap stage in line with debian

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] initscripts work around bug in debhelper systemd support
Andy Whitcroft [Fri, 3 Apr 2015 14:01:58 +0000 (15:01 +0100)]
UBUNTU: [Debian] initscripts work around bug in debhelper systemd support

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] initscripts need installing when making the package
Andy Whitcroft [Fri, 3 Apr 2015 13:03:12 +0000 (14:03 +0100)]
UBUNTU: [Debian] initscripts need installing when making the package

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] do_common_tools should always be on
Andy Whitcroft [Thu, 2 Apr 2015 14:51:04 +0000 (15:51 +0100)]
UBUNTU: [Debian] do_common_tools should always be on

do_common_tools is a mode specifier, it is on when we want tools and off
when we do not want tools.  It is intended to be flipped by the bootstrap
modes.  Whether those common tools are actually built is determined by
whether we are calling binary or binary-arch not related to whether we
want those packages to have content.

Enable this unconditionally.  This allows us to build the indep packages
on any arch is needed.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] module blacklists -- add support for manual blacklists
Andy Whitcroft [Mon, 23 Mar 2015 09:39:56 +0000 (09:39 +0000)]
UBUNTU: [Debian] module blacklists -- add support for manual blacklists

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] module-inclusion -- add manual command entries
Andy Whitcroft [Thu, 26 Mar 2015 14:00:16 +0000 (14:00 +0000)]
UBUNTU: [Debian] module-inclusion -- add manual command entries

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] module-inclusion -- commonise copy code and simplify
Andy Whitcroft [Thu, 26 Mar 2015 13:58:39 +0000 (13:58 +0000)]
UBUNTU: [Debian] module-inclusion -- commonise copy code and simplify

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] Add aufs update script
Tim Gardner [Tue, 12 May 2015 17:05:09 +0000 (11:05 -0600)]
UBUNTU: [Debian] Add aufs update script

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
7 years agoUBUNTU: [Debian] generate live watchdog blacklists
Andy Whitcroft [Tue, 17 Mar 2015 11:04:29 +0000 (11:04 +0000)]
UBUNTU: [Debian] generate live watchdog blacklists

BugLink: http://bugs.launchpad.net/bugs/1432837
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] control -- make element ordering deterministic
Andy Whitcroft [Tue, 10 Mar 2015 17:01:14 +0000 (17:01 +0000)]
UBUNTU: [Debian] control -- make element ordering deterministic

Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] systemd -- fix hyper-v units to be non-forking
Andy Whitcroft [Tue, 10 Feb 2015 20:48:15 +0000 (20:48 +0000)]
UBUNTU: [Debian] systemd -- fix hyper-v units to be non-forking

BugLink: http://bugs.launchpad.net/bugs/1401525
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] DEP8 test to run our regression tests
Brad Figg [Tue, 10 Feb 2015 17:21:19 +0000 (09:21 -0800)]
UBUNTU: [Debian] DEP8 test to run our regression tests

Signed-off-by: Brad Figg <brad.figg@canonical.com>
7 years agoUBUNTU: [Debian] hyper-v -- fix comment handing in /etc/network/interfaces
Andy Whitcroft [Wed, 21 Jan 2015 12:52:13 +0000 (12:52 +0000)]
UBUNTU: [Debian] hyper-v -- fix comment handing in /etc/network/interfaces

We are duplicating the opening comment marker every time we rebuild the
file, such that we end up with multiple of those comments:

    # This file describes the network interfaces available on your system
    # and how to activate them. For more information, see interfaces(5).

    # The loopback network interface
    auto lo
    iface lo inet loopback

    # The primary network interface
    # The following stanza(s) added by hv_set_ifconfig
    # The following stanza(s) added by hv_set_ifconfig
    # The following stanza(s) added by hv_set_ifconfig
    auto eth0
    iface eth0 inet static
    address 10.100.20.108
    gateway 10.100.20.1
    dns-nameservers 8.8.4.4

    #End of hv_set_ifconfig stanzas

Fix handling of these such that we only insert new markers if they do
not already exist.  Where they do, simply inject the new stanzas at the
end of the block before the end marker.  At the same time deduplicate
sequential begin and end markers to clean up previously dammaged files.

BugLink: http://bugs.launchpad.net/bugs/1413020
Signed-off-by: Andy Whitcroft <apw@canonical.com>
7 years agoUBUNTU: [Debian] force "dpkg-source -I -i" behavior
Kamal Mostafa [Fri, 16 Jan 2015 19:37:02 +0000 (11:37 -0800)]
UBUNTU: [Debian] force "dpkg-source -I -i" behavior

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
7 years agoUBUNTU: [Debian] hyper-v -- daemons now require -n for non-forking startup
Andy Whitcroft [Wed, 21 Jan 2015 14:23:53 +0000 (14:23 +0000)]
UBUNTU: [Debian] hyper-v -- daemons now require -n for non-forking startup

BugLink: http://bugs.launchpad.net/bugs/1408355
Signed-off-by: Andy Whitcroft <apw@canonical.com>