Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: edk2

edk2 (0~20180803.dd4cae4d-1ubuntu1) cosmic; urgency=medium * Merge with Debian unstable. Remaining changes: - debian/patches/enroll-default-keys.patch: Build EnrollDefaultKeys.efi to provide an automated way of injecting Microsoft signing keys in VMs that need them. - debian/control: add genisoimage, qemu-utils, qemu-system-x86, python3 to Build-Depends for the automatic key enrollment process. - debian/rules: - build a SecureBoot/SMM enabled variant of OVMF_CODE too. - build OVMF_VARS.ms.fd with embedded Microsoft keys from the binary EnrollDefaultKeys.efi - debian/ovmf.links: add OVMF_CODE.ms.fd. - debian/ovmf.install: install OVMF_VARS.ms.fd. -- dann frazier <dannf@ubuntu.com> Tue, 14 Aug 2018 16:09:06 -0600

Modifications :
  1. Download patch debian/rules

    --- 0~20180803.dd4cae4d-1/debian/rules 2018-08-03 21:35:01.000000000 +0000 +++ 0~20180803.dd4cae4d-1ubuntu1/debian/rules 2018-08-14 22:05:39.000000000 +0000 @@ -67,6 +67,7 @@ ifneq (,$(findstring ovmf, $(shell dh_li cd UefiCpuPkg/ResetVector/Vtf0 && python Build.py mkdir -p EdkShellBinPkg/FullShell/$(EDK2_ARCH_DIR) \ FatBinPkg/EnhancedFatDxe/$(EDK2_ARCH_DIR) + mkdir ovmf/ set -e; . ./edksetup.sh; \ build -a $(EDK2_HOST_ARCH) -p EdkShellPkg/EdkShellPkg.dsc -m Shell/ShellFull.inf \ -b RELEASE -t $(EDK2_TOOLCHAIN); \ @@ -82,7 +83,28 @@ ifneq (,$(findstring ovmf, $(shell dh_li -DHTTP_BOOT_ENABLE=TRUE \ -DSECURE_BOOT_ENABLE=TRUE \ -DFD_SIZE_2MB \ - -b RELEASE + -b RELEASE; \ + cp Build/Ovmf$(EDK2_HOST_ARCH)/*/FV/OVMF_*.fd ovmf/; \ + rm -rf Build/Ovmf$(EDK2_HOST_ARCH); \ + build -a $(EDK2_HOST_ARCH) \ + -t $(EDK2_TOOLCHAIN) \ + -p OvmfPkg/OvmfPkgX64.dsc \ + -DHTTP_BOOT_ENABLE=TRUE \ + -DSECURE_BOOT_ENABLE=TRUE \ + -DSMM_REQUIRE=TRUE \ + -DFD_SIZE_2MB \ + -b RELEASE; \ + cp Build/Ovmf$(EDK2_HOST_ARCH)/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd + cp Build/Ovmf$(EDK2_HOST_ARCH)/RELEASE_*GCC*/$(EDK2_ARCH_DIR)/EnrollDefaultKeys.efi ovmf/ + cp Build/Ovmf$(EDK2_HOST_ARCH)/RELEASE_*GCC*/$(EDK2_ARCH_DIR)/Shell.efi ovmf/ + debian/build-iso.sh ovmf/ + python3 debian/ovmf-vars-generator --qemu-binary /usr/bin/qemu-system-x86_64 \ + --disable-smm \ + --skip-testing \ + --ovmf-binary ovmf/OVMF_CODE.fd \ + --ovmf-template-vars ovmf/OVMF_VARS.fd \ + --uefi-shell-iso ovmf/UefiShell.iso \ + ovmf/OVMF_VARS.ms.fd endif build-qemu-efi: setup-build
  2. Download patch debian/control

    --- 0~20180803.dd4cae4d-1/debian/control 2018-08-03 21:35:01.000000000 +0000 +++ 0~20180803.dd4cae4d-1ubuntu1/debian/control 2018-08-14 22:05:39.000000000 +0000 @@ -1,9 +1,10 @@ Source: edk2 Section: misc Priority: optional -Maintainer: Debian QEMU Team <pkg-qemu-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian QEMU Team <pkg-qemu-devel@lists.alioth.debian.org> Uploaders: Steve Langasek <vorlon@debian.org>, Serge Hallyn <serge.hallyn@ubuntu.com>, dann frazier <dannf@debian.org> -Build-Depends: debhelper (>= 10), uuid-dev, iasl, gcc-multilib [i386], nasm, python, gcc-aarch64-linux-gnu, gcc-arm-linux-gnueabihf +Build-Depends: debhelper (>= 10), uuid-dev, iasl, gcc-multilib [i386], nasm, python, gcc-aarch64-linux-gnu, gcc-arm-linux-gnueabihf, genisoimage, qemu-utils, qemu-system-x86, python3 Standards-Version: 4.1.3 Homepage: http://www.tianocore.org Vcs-Git: https://salsa.debian.org/qemu-team/edk2.git
  3. Download patch debian/build-iso.sh

    --- 0~20180803.dd4cae4d-1/debian/build-iso.sh 1970-01-01 00:00:00.000000000 +0000 +++ 0~20180803.dd4cae4d-1ubuntu1/debian/build-iso.sh 2018-08-14 22:05:39.000000000 +0000 @@ -0,0 +1,26 @@ +#!/bin/sh + +# args +dir="$1" + +# cfg +shell="$dir/Shell.efi" +enroll="$dir/EnrollDefaultKeys.efi" +root="$dir/image" +vfat="$dir/shell.img" +iso="$dir/UefiShell.iso" + +# create non-partitioned (1.44 MB floppy disk) FAT image +mkdir "$root" +mkdir "$root"/efi +mkdir "$root"/efi/boot +cp "$shell" "$root"/efi/boot/bootx64.efi +cp "$enroll" "$root" +qemu-img convert --image-opts \ + driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir="$root/" \ + $vfat + +# build ISO with FAT image file as El Torito EFI boot image +genisoimage -input-charset ASCII -J -rational-rock \ + -efi-boot "${vfat##*/}" -no-emul-boot -o "$iso" -- "$vfat" +rm -rf "$root/" "$vfat"
  4. Download patch debian/ovmf.links
  5. Download patch debian/ovmf.install

    --- 0~20180803.dd4cae4d-1/debian/ovmf.install 2018-08-03 21:35:01.000000000 +0000 +++ 0~20180803.dd4cae4d-1ubuntu1/debian/ovmf.install 2018-08-14 22:05:39.000000000 +0000 @@ -1,3 +1,3 @@ Build/OvmfX64/RELEASE_*GCC*/FV/OVMF.fd /usr/share/ovmf -Build/OvmfX64/RELEASE_*GCC*/FV/OVMF_CODE.fd /usr/share/OVMF -Build/OvmfX64/RELEASE_*GCC*/FV/OVMF_VARS.fd /usr/share/OVMF +ovmf/OVMF_CODE*.fd /usr/share/OVMF +ovmf/OVMF_VARS*.fd /usr/share/OVMF
  6. Download patch debian/ovmf-vars-generator
  7. Download patch debian/patches/series

    --- 0~20180803.dd4cae4d-1/debian/patches/series 2018-08-03 21:35:01.000000000 +0000 +++ 0~20180803.dd4cae4d-1ubuntu1/debian/patches/series 2018-08-14 22:05:39.000000000 +0000 @@ -2,3 +2,4 @@ shell-efiapi.patch no-missing-braces.diff no-stack-protector-all-archs.diff shell-proper-valist.patch +enroll-default-keys.patch
  8. Download patch debian/copyright
  9. Download patch debian/patches/enroll-default-keys.patch
  1. edk2