openkylin
/
ci-test-sample
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TRANS.TBL in iso

This commit is contained in:
谢炜 2017-07-18 17:26:34 +08:00
parent ac2d68a0d5
commit 0e2cfe1d1d
59 changed files with 740 additions and 784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
live-build (3.0~a57-1ubuntu25k28) utopic; urgency=medium
* 0057-kylin-binary-trans-tbl.patch
- genisoimage命令添加-T参数，生成TRANS.TBL文件。
-- Xie Wei <xiewei@kylinos.cn> Tue, 18 Jul 2017 17:26:45 +0800
live-build (3.0~a57-1ubuntu25k27) utopic; urgency=medium
* strip-pool-for-di.patch

21
debian/patches/0057-kylin-binary-trans-tbl.patch vendored Normal file
View File

@ -0,0 +1,21 @@
From: =?utf-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
Date: Tue, 18 Jul 2017 17:25:15 +0800
Subject: kylin binary trans tbl
---
scripts/build/lb_binary_iso | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index 4a3133b..7f8f17a 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -74,7 +74,7 @@ then
fi
# Handle genisoimage generic options
-GENISOIMAGE_OPTIONS="-J -r"
+GENISOIMAGE_OPTIONS="-J -r -T"
# Handle genisoimage live-build specific options
if [ "${_QUIET}" = "true" ]

20
debian/patches/add-chroot-early vendored
View File

@ -1,10 +1,21 @@
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: add-chroot-early
Adds a new chroot_early hook type allowing actions prior to package
installation. This is required by Ubuntu Touch and possibly other
system-image type images where we want to force a pre-defined user/group
sets.
---
scripts/build/lb_chroot | 1 +
scripts/build/lb_chroot_early_hooks | 70 +++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 scripts/build/lb_chroot_early_hooks
--- live-build-3.0~a57.orig/scripts/build/lb_chroot
+++ live-build-3.0~a57/scripts/build/lb_chroot
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index a6136d9..b3b86b2 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -54,6 +54,7 @@ lb chroot_archives chroot install ${*}
# Customizing chroot
lb chroot_linux-image ${*}
@ -13,8 +24,11 @@ sets.
for _PASS in install live
do
diff --git a/scripts/build/lb_chroot_early_hooks b/scripts/build/lb_chroot_early_hooks
new file mode 100644
index 0000000..dcbaa65
--- /dev/null
+++ live-build-3.0~a57/scripts/build/lb_chroot_early_hooks
+++ b/scripts/build/lb_chroot_early_hooks
@@ -0,0 +1,70 @@
+#!/bin/sh
+

33
debian/patches/add-zesty.patch vendored
View File

@ -1,30 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu25k25ubuntu1) utopic; urgency=medium
.
* add zesty(17.04) release
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: add-zesty
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
functions/releases.sh | 1 +
1 file changed, 1 insertion(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/functions/releases.sh
+++ live-build-3.0~a57/functions/releases.sh
diff --git a/functions/releases.sh b/functions/releases.sh
index 02f1213..45645fe 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -34,3 +34,4 @@ RELEASE_ginkgo="4.0" # kylin ginkgo
RELEASE_xenial="16.04" # LTS
RELEASE_juniper="4.0" # kylin juniper

34
debian/patches/arm64-cross.patch vendored
View File

@ -1,31 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu25k24) utopic; urgency=medium
.
* arm64 cross:
- allow arm64 host build armhf livecd.
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: arm64-cross
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
functions/architectures.sh | 4 ++++
1 file changed, 4 insertions(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/functions/architectures.sh
+++ live-build-3.0~a57/functions/architectures.sh
diff --git a/functions/architectures.sh b/functions/architectures.sh
index 76eb88e..861f4a6 100755
--- a/functions/architectures.sh
+++ b/functions/architectures.sh
@@ -61,6 +61,10 @@ Check_crossarchitectures ()
CROSS="amd64 i386"
;;

21
debian/patches/chroot-resolv-conf-allow-symlinks vendored
View File

@ -1,18 +1,15 @@
Description: Allow symlinks for config/includes.chroot/etc/resolv.conf
Backport from the 4.0 branch to allow symlinks for
config/includes.chroot/etc/resolv.conf so that a image can have a
symlink to /run/resolvconf/resolv.conf
Author: Michael Vogt <michael.vogt@ubuntu.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: chroot-resolv-conf-allow-symlinks
---
Origin: vendor
Forwarded: not-needed
Last-Update: 2014-10-29
scripts/build/lb_chroot_resolv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: live-build-3.0~a57/scripts/build/lb_chroot_resolv
===================================================================
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_resolv
+++ live-build-3.0~a57/scripts/build/lb_chroot_resolv
diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv
index 37bf8af..9a7a052 100755
--- a/scripts/build/lb_chroot_resolv
+++ b/scripts/build/lb_chroot_resolv
@@ -76,7 +76,7 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock

11
debian/patches/dpkg-divert-initctl vendored
View File

@ -1,11 +1,18 @@
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: dpkg-divert-initctl
commit 20f042f923d25772cb87515a184308e2d2dec084
Author: Daniel Baumann <mail@daniel-baumann.ch>
Date: Mon Mar 11 09:26:37 2013 +0100
Using dpkg-divert in chroot_upstart script to handle upgrades of upstart during the build (Closes: #702537).
---
scripts/build/lb_chroot_upstart | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/scripts/build/chroot_upstart b/scripts/build/chroot_upstart
index 47d68c2..88dc3b2 100755
diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/lb_chroot_upstart
index ea22549..10b8899 100755
--- a/scripts/build/lb_chroot_upstart
+++ b/scripts/build/lb_chroot_upstart
@@ -27,6 +27,12 @@ Set_defaults

21
debian/patches/dpkg-divert-others vendored
View File

@ -1,11 +1,20 @@
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: dpkg-divert-others
commit 5a00aa44827cd477e13470b4ce417b7b6fff62f9
Author: Daniel Baumann <mail@daniel-baumann.ch>
Date: Mon Mar 11 09:49:07 2013 +0100
Using dpkg-divert for other diversions too to handle upgrades of the diverted stuff during build.
---
scripts/build/lb_chroot_dpkg | 14 +++++---------
scripts/build/lb_chroot_hostname | 18 +++++++-----------
scripts/build/lb_chroot_sysv-rc | 14 +++++++-------
3 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg
index b199cdf..07ef966 100755
diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg
index e2f76ad..1cdcc29 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/lb_chroot_dpkg
@@ -40,10 +40,8 @@ case "${1}" in
@ -36,8 +45,8 @@ index b199cdf..07ef966 100755
# Remove dpkg sync configuration
rm -f chroot/etc/dpkg/dpkg.cfg.d/live-build
diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname
index edc38a1..c42b1a7 100755
diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/lb_chroot_hostname
index 28cb501..2c88b41 100755
--- a/scripts/build/lb_chroot_hostname
+++ b/scripts/build/lb_chroot_hostname
@@ -29,8 +29,6 @@ Require_stagefile .build/config .build/bootstrap
@ -84,8 +93,8 @@ index edc38a1..c42b1a7 100755
# Removing stage file
rm -f .build/chroot_hostname
diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc
index 247290e..4dea100 100755
diff --git a/scripts/build/lb_chroot_sysv-rc b/scripts/build/lb_chroot_sysv-rc
index 94db1ca..c070a25 100755
--- a/scripts/build/lb_chroot_sysv-rc
+++ b/scripts/build/lb_chroot_sysv-rc
@@ -40,10 +40,10 @@ case "${1}" in

25
debian/patches/fix-chroot-archive.patch vendored
View File

@ -1,22 +1,15 @@
Description: 修复复制额外apt配置文件时的错误
Author: xiewei <xiewei@kylinos.cn>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1387709
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: fix-chroot-archive
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_chroot_archives | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_archives
+++ live-build-3.0~a57/scripts/build/lb_chroot_archives
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index dcfc260..379b591 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -291,7 +291,7 @@ EOF
do
if [ -e "${FILE}" ]

34
debian/patches/kylin-add-release.patch vendored
View File

@ -1,31 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12.1k12) utopic; urgency=medium
.
* kylin-add-release:
- add release xenial and juniper.
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-add-release
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
functions/releases.sh | 2 ++
1 file changed, 2 insertions(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/functions/releases.sh
+++ live-build-3.0~a57/functions/releases.sh
diff --git a/functions/releases.sh b/functions/releases.sh
index feb3be6..1aa8abd 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -31,3 +31,5 @@ RELEASE_saucy="13.10" # 2014-07-01
RELEASE_trusty="14.04" # LTS: 2019-04-01
RELEASE_utopic="14.10" #

34
debian/patches/kylin-archive-for-install.patch vendored
View File

@ -1,31 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu25k19) utopic; urgency=medium
.
* for install archive:
- add an empty binary-i386/Packages file when architecture is amd64
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-archive-for-install
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_binary_package-lists | 8 ++++++++
1 file changed, 8 insertions(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_binary_package-lists
+++ live-build-3.0~a57/scripts/build/lb_binary_package-lists
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index de064ab..1492cb1 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -155,6 +155,14 @@ then
do
SECTION="$(basename ${SECTION})"

34
debian/patches/kylin-change-chroot-package-priority.patch vendored
View File

@ -1,31 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12.1k11) utopic; urgency=medium
.
* kylin-change-chroot-package-priority:
- 本地上传包具有2000的优先级，以避免之前配置的远程仓库里的包覆盖本地上传的包。
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: kylin-change-chroot-package-priority
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_chroot_apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_apt
+++ live-build-3.0~a57/scripts/build/lb_chroot_apt
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index a800c63..20698df 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -131,7 +131,7 @@ case "${1}" in
case "${1}" in
install)

35
debian/patches/kylin-debian-installer.patch vendored
View File

@ -1,7 +1,21 @@
Description: 刘易修改的，为了在ft1500a上生成debian-installer安装的版本
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: kylin-debian-installer
---
data/debian-cd/squeeze/arm64_udeb_include | 49 ++++++++++++++++
data/debian-cd/squeeze/exclude-udebs | 2 +-
data/debian-cd/squeeze/exclude-udebs-arm64 | 91 ++++++++++++++++++++++++++++++
functions/releases.sh | 1 +
4 files changed, 142 insertions(+), 1 deletion(-)
create mode 100644 data/debian-cd/squeeze/arm64_udeb_include
create mode 100644 data/debian-cd/squeeze/exclude-udebs-arm64
diff --git a/data/debian-cd/squeeze/arm64_udeb_include b/data/debian-cd/squeeze/arm64_udeb_include
new file mode 100644
index 0000000..44f658c
--- /dev/null
+++ live-build-3.0~a57/data/debian-cd/squeeze/arm64_udeb_include
+++ b/data/debian-cd/squeeze/arm64_udeb_include
@@ -0,0 +1,49 @@
+netcfg
+ethdetect
@ -52,8 +66,10 @@ Description: 刘易修改的，为了在ft1500a上生成debian-installer安装
+usb-discover
+virtio-modules-3.16.0-23-generic-di
+vlan-modules-3.16.0-23-generic-di
--- live-build-3.0~a57.orig/data/debian-cd/squeeze/exclude-udebs
+++ live-build-3.0~a57/data/debian-cd/squeeze/exclude-udebs
diff --git a/data/debian-cd/squeeze/exclude-udebs b/data/debian-cd/squeeze/exclude-udebs
index ba3ed4f..0a0d1e9 100644
--- a/data/debian-cd/squeeze/exclude-udebs
+++ b/data/debian-cd/squeeze/exclude-udebs
@@ -115,7 +115,7 @@ debian-edu-archive-keyring-udeb
ltsp-client-builder
autopartkit
@ -63,8 +79,11 @@ Description: 刘易修改的，为了在ft1500a上生成debian-installer安装
simple-cdd-profiles
# If needed, will be on the initrd already
module-init-tools-udeb
diff --git a/data/debian-cd/squeeze/exclude-udebs-arm64 b/data/debian-cd/squeeze/exclude-udebs-arm64
new file mode 100644
index 0000000..ea92852
--- /dev/null
+++ live-build-3.0~a57/data/debian-cd/squeeze/exclude-udebs-arm64
+++ b/data/debian-cd/squeeze/exclude-udebs-arm64
@@ -0,0 +1,91 @@
+alsa-base-udeb
+at-spi2-core-udeb
@ -157,8 +176,10 @@ Description: 刘易修改的，为了在ft1500a上生成debian-installer安装
+system-integrity-check
+userdevfs
+wide-dhcpv6-client-udeb
--- live-build-3.0~a57.orig/functions/releases.sh
+++ live-build-3.0~a57/functions/releases.sh
diff --git a/functions/releases.sh b/functions/releases.sh
index 2119888..feb3be6 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -29,4 +29,5 @@ RELEASE_quantal="12.10" # 2014-04-01
RELEASE_raring="13.04" # 2014-01-01
RELEASE_saucy="13.10" # 2014-07-01

33
debian/patches/kylin-debian_installer-cd_type.patch vendored
View File

@ -1,30 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12k6) utopic; urgency=medium
.
* set debian_installer/cdrom cd_type to full_cd/single
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: kylin-debian_installer-cd_type
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_binary_disk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_binary_disk
+++ live-build-3.0~a57/scripts/build/lb_binary_disk
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index ce11019..738fa0e 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -131,7 +131,7 @@ case "${LB_DEBIAN_INSTALLER}" in
touch binary/.disk/base_installable

34
debian/patches/kylin-enable-archive-for-install.patch vendored
View File

@ -1,31 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu25k20) utopic; urgency=medium
.
* for install archive:
- add some file in binary/ to enable install archive
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-enable-archive-for-install
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_binary_disk | 4 ++++
1 file changed, 4 insertions(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_binary_disk
+++ live-build-3.0~a57/scripts/build/lb_binary_disk
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index 738fa0e..022f329 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -93,6 +93,10 @@ fi
case "${LB_INITRAMFS}" in

27
debian/patches/kylin-iso-archive.patch vendored
View File

@ -1,24 +1,15 @@
Description: create all 4 components in binary archive
live-build (3.0~a57-1ubuntu25k16) utopic; urgency=medium
.
* 在光盘源里创建4个component
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-iso-archive
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_binary_package-lists | 3 +++
1 file changed, 3 insertions(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_binary_package-lists
+++ live-build-3.0~a57/scripts/build/lb_binary_package-lists
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index a63cecf..de064ab 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -147,6 +147,9 @@ then
done

23
debian/patches/kylin-iso-option2.patch vendored
View File

@ -1,18 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12k4) utopic; urgency=medium
.
* change mkisofs options, for ft1500a uboot bios
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: kylin-iso-option2
---
scripts/build/lb_binary_iso | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- live-build-3.0~a57.orig/scripts/build/lb_binary_iso
+++ live-build-3.0~a57/scripts/build/lb_binary_iso
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index ea68720..f517168 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -73,7 +73,7 @@ then
fi

36
debian/patches/kylin-ltz-adjtime.patch vendored
View File

@ -1,32 +1,16 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu25k22) utopic; urgency=medium
.
* ltz-adjtime:
- 保留kylin-setting包提供的/etc/adjtime
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-ltz-adjtime
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_chroot_hacks | 1 -
1 file changed, 1 deletion(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_hacks
+++ live-build-3.0~a57/scripts/build/lb_chroot_hacks
@@ -226,7 +226,6 @@ rm -f chroot/etc/gshadow- chroot/etc/sha
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 9d32be2..5756971 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -226,7 +226,6 @@ rm -f chroot/etc/gshadow- chroot/etc/shadow-
rm -f chroot/var/cache/debconf/*-old
rm -f chroot/var/lib/dpkg/*-old
rm -f chroot/var/log/apt/term.log

24
debian/patches/kylin-md5-checksum.patch vendored
View File

@ -1,17 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12k2) utopic; urgency=medium
.
* create md5sum.txt
Author: xiewei <xiewei@bounces@canonical.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: kylin-md5-checksum
--- live-build-3.0~a57.orig/scripts/build/lb_binary_checksums
+++ live-build-3.0~a57/scripts/build/lb_binary_checksums
---
scripts/build/lb_binary_checksums | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/scripts/build/lb_binary_checksums b/scripts/build/lb_binary_checksums
index 7e9cda0..43ed390 100755
--- a/scripts/build/lb_binary_checksums
+++ b/scripts/build/lb_binary_checksums
@@ -77,6 +77,19 @@ EOF
cd "${OLDPWD}"
done

24
debian/patches/kylin-mkiso-options.patch vendored
View File

@ -1,17 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12k3) utopic; urgency=medium
.
* fix mkisofs options
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: kylin-mkiso-options
--- live-build-3.0~a57.orig/scripts/build/lb_binary_iso
+++ live-build-3.0~a57/scripts/build/lb_binary_iso
---
scripts/build/lb_binary_iso | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index d466656..ea68720 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -73,7 +73,7 @@ then
fi

33
debian/patches/kylin-release-ginkgo.patch vendored
View File

@ -1,30 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12k7) utopic; urgency=medium
.
* define RELEASE_ginkgo="4.0"
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: kylin-release-ginkgo
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
functions/releases.sh | 1 +
1 file changed, 1 insertion(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/functions/releases.sh
+++ live-build-3.0~a57/functions/releases.sh
diff --git a/functions/releases.sh b/functions/releases.sh
index 78bf4fe..2119888 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -29,3 +29,4 @@ RELEASE_quantal="12.10" # 2014-04-01
RELEASE_raring="13.04" # 2014-01-01
RELEASE_saucy="13.10" # 2014-07-01

33
debian/patches/kylin-release-yakkety.patch vendored
View File

@ -1,30 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu25k18) utopic; urgency=medium
.
* add release yakkety
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-release-yakkety
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
functions/releases.sh | 1 +
1 file changed, 1 insertion(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/functions/releases.sh
+++ live-build-3.0~a57/functions/releases.sh
diff --git a/functions/releases.sh b/functions/releases.sh
index 1aa8abd..02f1213 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -33,3 +33,4 @@ RELEASE_utopic="14.10" #
RELEASE_ginkgo="4.0" # kylin ginkgo
RELEASE_xenial="16.04" # LTS

33
debian/patches/kylin-uefi-2.patch vendored
View File

@ -1,30 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu25k17) utopic; urgency=medium
.
* uefi引导文件也可以是boot/grub/efi.img
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-uefi-2
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_binary_iso | 3 +++
1 file changed, 3 insertions(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_binary_iso
+++ live-build-3.0~a57/scripts/build/lb_binary_iso
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index 9bcc7ac..4180fae 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -163,6 +163,9 @@ esac
if test -f "binary/images/efiboot.img"
then

36
debian/patches/kylin-uefi.patch vendored
View File

@ -1,33 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12.1k13) utopic; urgency=medium
.
* kylin-uefi:
- if binary/images/efiboot.img exists, set it as uefi boot file.
Author: xiewei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-uefi
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_binary_iso | 6 ++++++
1 file changed, 6 insertions(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
Index: live-build/scripts/build/lb_binary_iso
===================================================================
--- live-build.orig/scripts/build/lb_binary_iso
+++ live-build/scripts/build/lb_binary_iso
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index f517168..9bcc7ac 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -159,6 +159,12 @@ esac
# GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
#fi

41
debian/patches/kylin-x86-debian-installer.patch vendored
View File

@ -1,31 +1,16 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu25k25) utopic; urgency=medium
.
* kylin-x86-debian-installer:
- ltz: 做x86 debian-install版本修改
Author: Xie Wei <xiewei@kylinos.cn>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: kylin-x86-debian-installer
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_binary_debian-installer | 4 ++--
scripts/build/lb_binary_iso | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_binary_debian-installer
+++ live-build-3.0~a57/scripts/build/lb_binary_debian-installer
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index b3bac4b..660c8b1 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -344,7 +344,7 @@ then
case "${LB_ARCHITECTURES}" in
@ -44,8 +29,10 @@ Last-Update: <YYYY-MM-DD>
case "${LB_MODE}" in
ubuntu|kubuntu)
--- live-build-3.0~a57.orig/scripts/build/lb_binary_iso
+++ live-build-3.0~a57/scripts/build/lb_binary_iso
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index 4d25199..4a3133b 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -206,7 +206,7 @@ cat >> binary.sh << EOF
genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
EOF

33
debian/patches/kylin_fix_archive_prefs.patch vendored
View File

@ -1,30 +1,15 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
live-build (3.0~a57-1ubuntu12k5) utopic; urgency=medium
.
* fix lb_chroot_archives bug, while no _FILE defined, should be FILE
Author: xiewei <xiewei@bounces@canonical.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: kylin_fix_archive_prefs
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_chroot_archives | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_archives
+++ live-build-3.0~a57/scripts/build/lb_chroot_archives
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 9f5b458..dcfc260 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -291,7 +291,7 @@ EOF
do
if [ -e "${FILE}" ]

51
debian/patches/live-build-3.0~a57-ltz-efi.patch vendored
View File

@ -1,7 +1,21 @@
Index: live-build/scripts/build/lb_binary
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: live-build-3.0~a57-ltz-efi
===================================================================
--- live-build.orig/scripts/build/lb_binary
+++ live-build/scripts/build/lb_binary
---
scripts/build/lb_binary | 1 +
scripts/build/lb_binary_grub2-efi | 364 ++++++++++++++++++++++++++++++++++
scripts/build/lb_binary_iso | 3 +-
scripts/build/lb_binary_package-lists | 33 +++
templates/grub2/grub.cfg | 15 +-
5 files changed, 411 insertions(+), 5 deletions(-)
create mode 100644 scripts/build/lb_binary_grub2-efi
diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 600d893..13540ec 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -65,6 +65,7 @@ lb binary_debian-installer ${*}
lb binary_memtest ${*}
lb binary_grub ${*}
@ -10,10 +24,11 @@ Index: live-build/scripts/build/lb_binary
lb binary_syslinux ${*}
lb binary_yaboot ${*}
lb binary_silo ${*}
Index: live-build/scripts/build/lb_binary_grub2-efi
===================================================================
diff --git a/scripts/build/lb_binary_grub2-efi b/scripts/build/lb_binary_grub2-efi
new file mode 100644
index 0000000..489d06b
--- /dev/null
+++ live-build/scripts/build/lb_binary_grub2-efi
+++ b/scripts/build/lb_binary_grub2-efi
@@ -0,0 +1,364 @@
+#!/bin/sh
+
@ -379,10 +394,10 @@ Index: live-build/scripts/build/lb_binary_grub2-efi
+
+# Creating stage file
+Create_stagefile .build/binary_grub2_efi
Index: live-build/scripts/build/lb_binary_iso
===================================================================
--- live-build.orig/scripts/build/lb_binary_iso
+++ live-build/scripts/build/lb_binary_iso
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index 4180fae..4d25199 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -17,6 +17,7 @@ set -e
DESCRIPTION="$(Echo 'build iso binary image')"
HELP=""
@ -400,10 +415,10 @@ Index: live-build/scripts/build/lb_binary_iso
;;
false)
Index: live-build/scripts/build/lb_binary_package-lists
===================================================================
--- live-build.orig/scripts/build/lb_binary_package-lists
+++ live-build/scripts/build/lb_binary_package-lists
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index 1492cb1..a22da5a 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -38,6 +38,23 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
@ -451,10 +466,10 @@ Index: live-build/scripts/build/lb_binary_package-lists
for FILE in chroot/binary.deb/archives/*.deb
do
SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
Index: live-build/templates/grub2/grub.cfg
===================================================================
--- live-build.orig/templates/grub2/grub.cfg
+++ live-build/templates/grub2/grub.cfg
diff --git a/templates/grub2/grub.cfg b/templates/grub2/grub.cfg
index 4ad86bd..e65e389 100644
--- a/templates/grub2/grub.cfg
+++ b/templates/grub2/grub.cfg
@@ -1,9 +1,16 @@
set default=0
+set timeout=3

19
debian/patches/remove-etc-machineid vendored
View File

@ -1,16 +1,15 @@
Description: Truncate /etc/machine-id (in addition to /var/lib/dbus/machine-id)
Systemd is using a /etc/machine-id file that needs to be unique to the
local system. Just like we remove /var/lib/dbus/machine-id we truncate
/etc/machine-id. This will make systemd generate a new one on each boot.
Author: Michael Vogt <michael.vogt@ubuntu.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: remove-etc-machineid
---
Origin: vendor
Forwarded: no
Last-Update: 2014-10-29
share/hooks/004-remove-dbus-machine-id.chroot | 3 +++
1 file changed, 3 insertions(+)
--- live-build-3.0~a57.orig/share/hooks/004-remove-dbus-machine-id.chroot
+++ live-build-3.0~a57/share/hooks/004-remove-dbus-machine-id.chroot
diff --git a/share/hooks/004-remove-dbus-machine-id.chroot b/share/hooks/004-remove-dbus-machine-id.chroot
index 230099e..6beac3b 100755
--- a/share/hooks/004-remove-dbus-machine-id.chroot
+++ b/share/hooks/004-remove-dbus-machine-id.chroot
@@ -7,3 +7,6 @@ set -e
# This removes dbus machine id that cache that makes each system unique.

1
debian/patches/series vendored
View File

@ -54,3 +54,4 @@ arm64-cross.patch
kylin-x86-debian-installer.patch
add-zesty.patch
strip-pool-for-di.patch
0057-kylin-binary-trans-tbl.patch

24
debian/patches/strip-pool-for-di.patch vendored
View File

@ -1,7 +1,17 @@
Index: live-build/scripts/build/lb_binary_debian-installer
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: strip-pool-for-di
===================================================================
--- live-build.orig/scripts/build/lb_binary_debian-installer
+++ live-build/scripts/build/lb_binary_debian-installer
---
scripts/build/lb_binary_debian-installer | 90 ++++++++++++++++++++++----------
scripts/build/lb_binary_package-lists | 26 ++++-----
2 files changed, 75 insertions(+), 41 deletions(-)
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 660c8b1..b8ad59e 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -338,10 +338,15 @@ if [ "${DI_IMAGE_TYPE}" != "netboot" ]
then
# Downloading additional packages
@ -127,10 +137,10 @@ Index: live-build/scripts/build/lb_binary_debian-installer
fi
# Including local debs
Index: live-build/scripts/build/lb_binary_package-lists
===================================================================
--- live-build.orig/scripts/build/lb_binary_package-lists
+++ live-build/scripts/build/lb_binary_package-lists
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index a22da5a..836fd8b 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -94,20 +94,14 @@ then
fi

34
debian/patches/strip-pool.patch vendored
View File

@ -1,20 +1,16 @@
Description: strip pool
not include installed deb packages in pool/, this option will not affect when debian-installer used.
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: strip-pool
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
scripts/build/lb_binary_package-lists | 13 +++++++++++++
scripts/build/lb_config | 12 +++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- live-build-3.0~a57.orig/scripts/build/lb_binary_package-lists
+++ live-build-3.0~a57/scripts/build/lb_binary_package-lists
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index 611b01f..a63cecf 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -80,6 +80,19 @@ then
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status
@ -35,9 +31,11 @@ Last-Update: <YYYY-MM-DD>
for LIST in config/package-lists/*.list \
config/package-lists/*.list.binary
do
--- live-build-3.0~a57.orig/scripts/build/lb_config
+++ live-build-3.0~a57/scripts/build/lb_config
@@ -104,6 +104,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 8dbd0b8..ffc1e3f 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -104,6 +104,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--mirror-binary-backports URL]\n\
\t [--mirror-debian-installer URL]\n\
\t [--mode debian|emdebian|ubuntu|kubuntu]\n\

21
debian/patches/ubuntu-add-raring-version.patch vendored
View File

@ -1,13 +1,16 @@
Description: add raring version number as a known release
Origin: backport, http://live.debian.net/gitweb/?p=live-build.git;a=commit;h=d766063e128b6f51df58e90956f462343ca3808d
Bug-Ubuntu: https://launchpad.net/bugs/1174791
Forwarded: not-needed
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-add-raring-version
---
Index: live-build-3.0~a57/functions/releases.sh
===================================================================
--- live-build-3.0~a57.orig/functions/releases.sh 2012-08-09 20:32:51.000000000 +0900
+++ live-build-3.0~a57/functions/releases.sh 2013-05-01 00:42:31.044073697 +0900
@@ -26,3 +26,4 @@
functions/releases.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/functions/releases.sh b/functions/releases.sh
index 6871c12..08952b1 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -26,3 +26,4 @@ RELEASE_natty="11.04" # 2012-10-01
RELEASE_oneiric="11.10" # 2013-04-01
RELEASE_precise="12.04" # LTS: 2017-04-01
RELEASE_quantal="12.10" # 2014-04-01

19
debian/patches/ubuntu-add-saucy-trusty-version.patch vendored
View File

@ -1,12 +1,15 @@
Description: add saucy and trusty version number as a known release
Author: Paolo Sammicheli <xdatap1@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1300400
Forwarded: not-needed
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-add-saucy-trusty-version
---
Index: live-build-3.0~a57/functions/releases.sh
===================================================================
--- live-build-3.0~a57.orig/functions/releases.sh
+++ live-build-3.0~a57/functions/releases.sh
functions/releases.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/functions/releases.sh b/functions/releases.sh
index 08952b1..78bf4fe 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -27,3 +27,5 @@ RELEASE_oneiric="11.10" # 2013-04-01
RELEASE_precise="12.04" # LTS: 2017-04-01
RELEASE_quantal="12.10" # 2014-04-01

15
debian/patches/ubuntu-allow-downgrades vendored
View File

@ -1,8 +1,15 @@
Description: Allow base system downgrades.
Author: Adam Conrad <adconrad@ubuntu.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: ubuntu-allow-downgrades
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_archives
+++ live-build-3.0~a57/scripts/build/lb_chroot_archives
---
scripts/build/lb_chroot_archives | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 379b591..5976cd8 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -564,8 +564,8 @@ EOF
rm -rf chroot/var/cache/apt/*.bin

15
debian/patches/ubuntu-arm64-support.patch vendored
View File

@ -1,8 +1,15 @@
Description: Add skeleton arm64 support, so that ubuntu-core can build.
Author: Adam Conrad <adconrad@ubuntu.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-arm64-support
--- live-build-3.0~a57.orig/functions/defaults.sh
+++ live-build-3.0~a57/functions/defaults.sh
---
functions/defaults.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index b769bb7..ea30b31 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -702,6 +702,10 @@ Set_defaults ()
# Setting linux flavour string

16
debian/patches/ubuntu-build-wubildr.patch vendored
View File

@ -1,9 +1,15 @@
Description: Build the wubildr bootloader for Wubi
Author: Evan Dandrea <ev@ubuntu.com>
Last-Update: 2012-08-20
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:07 +0800
Subject: ubuntu-build-wubildr
Index: b/share/hooks/100-build-wubildr.binary
===================================================================
---
share/hooks/100-build-wubildr.binary | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 share/hooks/100-build-wubildr.binary
diff --git a/share/hooks/100-build-wubildr.binary b/share/hooks/100-build-wubildr.binary
new file mode 100644
index 0000000..66d1944
--- /dev/null
+++ b/share/hooks/100-build-wubildr.binary
@@ -0,0 +1,36 @@

15
debian/patches/ubuntu-casper-normalisation.patch vendored
View File

@ -1,15 +1,18 @@
Description: Fixup live.cfg for casper
Author: Reinhard Tartler <siretart@tauware.de>
Last-Update: 2012-08-20
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:07 +0800
Subject: ubuntu-casper-normalisation
live.cfg from the themes package include a 'boot=live' parameter, which works only
for live-config. casper OTOH requires 'boot=casper'
---
scripts/build/lb_binary_syslinux | 7 +++++++
1 file changed, 7 insertions(+)
Index: b/scripts/build/lb_binary_syslinux
===================================================================
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 300841a..3b7bedb 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -254,6 +254,13 @@
@@ -254,6 +254,13 @@ then
sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
${_TARGET}/live.cfg

58
debian/patches/ubuntu-chroot-fs-opts.patch vendored
View File

@ -1,13 +1,30 @@
Description: Add options to tune the EXT FS produced in lb_binary_rootfs
Adds --ext-block-size, --ext-resize-blocks and --ext-fudge-factor to
enable building filesystem images with 4K blocks that can be
online-resized to a configurable length.
Author: Daniel Watkins <daniel.watkins@canonical.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: ubuntu-chroot-fs-opts
Index: live-build/scripts/build/lb_binary_rootfs
===================================================================
--- live-build.orig/scripts/build/lb_binary_rootfs
+++ live-build/scripts/build/lb_binary_rootfs
---
functions/losetup.sh | 2 +-
scripts/build/lb_binary_rootfs | 4 ++--
scripts/build/lb_config | 32 +++++++++++++++++++++++++++++++-
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/functions/losetup.sh b/functions/losetup.sh
index b62cc16..fb7ebef 100755
--- a/functions/losetup.sh
+++ b/functions/losetup.sh
@@ -68,7 +68,7 @@ Calculate_partition_size ()
case "${FILESYSTEM}" in
ext2|ext3|ext4)
- PERCENT="5"
+ PERCENT="${LB_EXT_FUDGEFACTOR:-5}"
;;
*)
PERCENT="3"
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 65869a9..e333680 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -129,7 +129,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
FAKE_MTAB="true"
fi
@ -26,11 +43,11 @@ Index: live-build/scripts/build/lb_binary_rootfs
mkdir -p filesystem.tmp
${LB_ROOT_COMMAND} mount -o loop binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
Index: live-build/scripts/build/lb_config
===================================================================
--- live-build.orig/scripts/build/lb_config
+++ live-build/scripts/build/lb_config
@@ -57,6 +57,9 @@ USAGE="${PROGRAM} [--apt apt|aptitude]
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index ffc1e3f..703644b 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -57,6 +57,9 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--debian-installer-gui true|false]\n\
\t [--debug]\n\
\t [-d|--distribution CODENAME]\n\
@ -90,16 +107,3 @@ Index: live-build/scripts/build/lb_config
# \$LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
# (Default: unset)
LB_JFFS2_ERASEBLOCK=""
Index: live-build/functions/losetup.sh
===================================================================
--- live-build.orig/functions/losetup.sh
+++ live-build/functions/losetup.sh
@@ -68,7 +68,7 @@ Calculate_partition_size ()
case "${FILESYSTEM}" in
ext2|ext3|ext4)
- PERCENT="5"
+ PERCENT="${LB_EXT_FUDGEFACTOR:-5}"
;;
*)
PERCENT="3"

27
debian/patches/ubuntu-chroot_headers_tidy.patch vendored
View File

@ -1,16 +1,17 @@
Description: Tidy up linux-headers installation and duplication
ubuntu-chroot_headers_tidy.patch: Mark all the linux-headers-$(ABI)
packages as autoinstalled, and then autoremove cruft (LP: #1029556)
Author: Adam Conrad <adconrad@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1029556
Forwarded: no
Last-Update: 2012-08-20
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-chroot_headers_tidy
Index: b/scripts/build/lb_chroot
===================================================================
---
scripts/build/lb_chroot | 6 ++++++
scripts/build/lb_clean | 1 +
2 files changed, 7 insertions(+)
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index ada67c3..a6136d9 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -62,6 +62,12 @@
@@ -62,6 +62,12 @@ do
if [ "${_PASS}" = install ]
then
@ -23,11 +24,11 @@ Index: b/scripts/build/lb_chroot
Chroot chroot "dpkg-query -W" > chroot.packages.install
fi
done
Index: b/scripts/build/lb_clean
===================================================================
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index 4b7c23b..e500a8c 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -88,6 +88,7 @@
@@ -88,6 +88,7 @@ do
${LB_ROOT_COMMAND} rm -rf chroot chroot.tmp
rm -f chroot.packages.live chroot.packages.install

17
debian/patches/ubuntu-debootstrap-variants.patch vendored
View File

@ -1,13 +1,16 @@
Description: Fix handling of --bootstrap-flavour with debootstrap
Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Debian: http://bugs.debian.org/685675
Last-Update: 2012-08-23
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-debootstrap-variants
Index: b/scripts/build/lb_bootstrap_debootstrap
===================================================================
---
scripts/build/lb_bootstrap_debootstrap | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index d5865b6..7d08b61 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -84,7 +84,18 @@
@@ -84,7 +84,18 @@ case "${LB_USE_FAKEROOT}" in
false)
if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ]
then

25
debian/patches/ubuntu-ext-inodes.patch vendored
View File

@ -1,19 +1,16 @@
Description: Upstream changes introduced in version 3.0~a24-1ubuntu13
.
* Mimic livecd-rootfs's handling of inodes on ext* filesystems to
reduce the pain of resizing preinstalled images. (LP: #836810)
.
* This patch is a dirty hack, and needs some TLC and generalisation
before it's reasonably upstreamable.
Author: Adam Conrad <adconrad@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/836810
Last-Update: 2012-08-20
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-ext-inodes
Index: b/scripts/build/lb_binary_rootfs
===================================================================
---
scripts/build/lb_binary_rootfs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 860b600..69e375b 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -129,7 +129,7 @@
@@ -129,7 +129,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
FAKE_MTAB="true"
fi
@ -22,7 +19,7 @@ Index: b/scripts/build/lb_binary_rootfs
mkdir -p filesystem.tmp
${LB_ROOT_COMMAND} mount -o loop chroot/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
@@ -199,7 +199,7 @@
@@ -199,7 +199,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
false)
dd if=/dev/zero of=binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM}

16
debian/patches/ubuntu-fix-binary-hooks.patch vendored
View File

@ -1,12 +1,16 @@
Description: Fix execution of binary hooks
Author: Colin Watson <cjwatson@ubuntu.com>
Last-Update: 2012-08-24
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-fix-binary-hooks
Index: b/scripts/build/lb_binary_hooks
===================================================================
---
scripts/build/lb_binary_hooks | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/build/lb_binary_hooks b/scripts/build/lb_binary_hooks
index 1604700..a53330f 100755
--- a/scripts/build/lb_binary_hooks
+++ b/scripts/build/lb_binary_hooks
@@ -50,7 +50,7 @@
@@ -50,7 +50,7 @@ do
if [ -e "${FILE}" ]
then
cd binary

68
debian/patches/ubuntu-fix-hooks.patch vendored
View File

@ -1,38 +1,17 @@
Description: Fix hook execution
Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685534
Last-Update: 2012-08-21
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-fix-hooks
Index: b/scripts/build/lb_chroot_hooks
===================================================================
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -54,12 +54,14 @@
do
for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
do
- if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ]
- then
- mkdir -p chroot/root/lb_chroot_hooks
- cp "${LOCATION}"/hooks/???-"${_HOOK}".chroot chroot/root/lb_chroot_hooks
- continue
- fi
+ for FILE in "${LOCATION}"/???-"${_HOOK}".chroot
+ do
+ if [ -e "${FILE}" ]
+ then
+ mkdir -p chroot/root/lb_chroot_hooks
+ cp "${FILE}" chroot/root/lb_chroot_hooks
+ fi
+ done
done
done
Index: b/scripts/build/lb_binary_hooks
===================================================================
---
scripts/build/lb_binary_hooks | 11 ++++++-----
scripts/build/lb_chroot_hooks | 14 ++++++++------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/scripts/build/lb_binary_hooks b/scripts/build/lb_binary_hooks
index 8018f79..1604700 100755
--- a/scripts/build/lb_binary_hooks
+++ b/scripts/build/lb_binary_hooks
@@ -43,17 +43,18 @@
@@ -43,17 +43,18 @@ Create_lockfile .lock
# Running hooks
for _HOOK in ${LB_BINARY_HOOKS}
do
@ -56,3 +35,28 @@ Index: b/scripts/build/lb_binary_hooks
done
## Processing local hooks
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index 368e922..71f123c 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -54,12 +54,14 @@ for _HOOK in ${LB_CHROOT_HOOKS}
do
for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
do
- if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ]
- then
- mkdir -p chroot/root/lb_chroot_hooks
- cp "${LOCATION}"/hooks/???-"${_HOOK}".chroot chroot/root/lb_chroot_hooks
- continue
- fi
+ for FILE in "${LOCATION}"/???-"${_HOOK}".chroot
+ do
+ if [ -e "${FILE}" ]
+ then
+ mkdir -p chroot/root/lb_chroot_hooks
+ cp "${FILE}" chroot/root/lb_chroot_hooks
+ fi
+ done
done
done

25
debian/patches/ubuntu-i386-generic-pae.patch vendored
View File

@ -1,14 +1,17 @@
Description: Use i386 -generic-pae kernel flavour on Ubuntu precise
Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/897786
Forwarded: no
Last-Update: 2012-08-20
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-i386-generic-pae
Index: b/functions/defaults.sh
===================================================================
---
functions/defaults.sh | 9 ++++++++-
scripts/build/lb_binary_debian-installer | 9 ++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 08da782..1ad0205 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -748,7 +748,14 @@
@@ -748,7 +748,14 @@ Set_defaults ()
;;
ubuntu|kubuntu)
@ -24,11 +27,11 @@ Index: b/functions/defaults.sh
;;
*)
Index: b/scripts/build/lb_binary_debian-installer
===================================================================
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 667887a..cc94a84 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -362,7 +362,14 @@
@@ -362,7 +362,14 @@ then
case "${LB_MODE}" in
ubuntu|kubuntu)

19
debian/patches/ubuntu-kernel-img-conf.patch vendored
View File

@ -1,15 +1,16 @@
Description: Put kernel symlinks in /boot on some architectures
This matches base-installer/library.sh more closely.
Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/958839
Forwarded: no
Last-Update: 2012-04-18
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-kernel-img-conf
Index: b/scripts/build/lb_chroot_linux-image
===================================================================
---
scripts/build/lb_chroot_linux-image | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index e2ca830..0244933 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -118,6 +118,24 @@
@@ -118,6 +118,24 @@ EOF
fi

15
debian/patches/ubuntu-label-disks.patch vendored
View File

@ -1,8 +1,15 @@
Description: Apply LB_HDD_LABEL to disks produced in lb_binary_rootfs.
Author: Daniel Watkins <daniel.watkins@canonical.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: ubuntu-label-disks
--- live-build-3.0~a57.orig/scripts/build/lb_binary_rootfs
+++ live-build-3.0~a57/scripts/build/lb_binary_rootfs
---
scripts/build/lb_binary_rootfs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index e5ad70c..65869a9 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -129,7 +129,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
FAKE_MTAB="true"
fi

20
debian/patches/ubuntu-no-adjtime.patch vendored
View File

@ -1,11 +1,15 @@
Description: Drop etc/adjtime from scripts/build/lb_chroot_hacks.
/etc/adjtime is not needed and should not be used in Ubuntu.
Author: Steve Langasek <steve.langasek@ubuntu.com>
Forwarded: no
Last-Update: 2013-09-27
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-no-adjtime
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_hacks
+++ live-build-3.0~a57/scripts/build/lb_chroot_hacks
---
scripts/build/lb_chroot_hacks | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index d79ccd5..9d32be2 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -218,9 +218,6 @@ esac
# people might do in local hooks, and there might be no initrds at all.
find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r
@ -16,7 +20,7 @@ Last-Update: 2013-09-27
# Remove cruft
rm -f chroot/boot/initrd*bak*
rm -f chroot/etc/apt/trusted.gpg~
@@ -229,6 +226,7 @@ rm -f chroot/etc/gshadow- chroot/etc/sha
@@ -229,6 +226,7 @@ rm -f chroot/etc/gshadow- chroot/etc/shadow-
rm -f chroot/var/cache/debconf/*-old
rm -f chroot/var/lib/dpkg/*-old
rm -f chroot/var/log/apt/term.log

17
debian/patches/ubuntu-no-xz-squashfs.patch vendored
View File

@ -1,10 +1,15 @@
Description: Don't turn on xz compression in mksquashfs for ubuntu builds.
Author: Adam Conrad <adconrad@ubuntu.com>
Forwarded: no
Last-Update: 2012-08-24
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-no-xz-squashfs
--- live-build-3.0~a57.orig/scripts/build/lb_binary_rootfs
+++ live-build-3.0~a57/scripts/build/lb_binary_rootfs
---
scripts/build/lb_binary_rootfs | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 69e375b..e5ad70c 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -363,8 +363,15 @@ case "${LB_CHROOT_FILESYSTEM}" in
;;

25
debian/patches/ubuntu-pack-bootlogo.patch vendored
View File

@ -1,18 +1,15 @@
Description: carry over hack from ubuntu-cdimage to update bootlogo with contents
New gfxboot in utopic does no longer support loading assets from outside the
bootlogo archive, so we pack everything together and update bootlogo as part of the
syslinux build part.
Author: Harald Sitter <apachelogger@kubuntu.org>
Origin: vendor
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/live-build/+bug/1387709
Forwarded: no
Reviewed-by: Rohan Garg <rohangarg@kubuntu.org>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-pack-bootlogo
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: live-build-3.0~a57/scripts/build/lb_binary_syslinux
===================================================================
--- live-build-3.0~a57.orig/scripts/build/lb_binary_syslinux
+++ live-build-3.0~a57/scripts/build/lb_binary_syslinux
scripts/build/lb_binary_syslinux | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 3b7bedb..b441cdb 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -359,6 +359,22 @@ case "${LB_MODE}" in
;;
esac

41
debian/patches/ubuntu-package-lists-without-chroot.patch vendored
View File

@ -1,12 +1,18 @@
Description: If --build-with-chroot is false, run ! lines in package-lists in the host system
Author: Colin Watson <cjwatson@ubuntu.com>
Last-Update: 2012-08-21
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-package-lists-without-chroot
Index: b/functions/packagelists.sh
===================================================================
---
functions/packagelists.sh | 10 ++++++-
scripts/build/lb_binary_package-lists | 48 ++++++++++++++++++++++++---------
scripts/build/lb_chroot_package-lists | 50 +++++++++++++++++++++++------------
3 files changed, 77 insertions(+), 31 deletions(-)
diff --git a/functions/packagelists.sh b/functions/packagelists.sh
index 8a6141b..aad1ea2 100755
--- a/functions/packagelists.sh
+++ b/functions/packagelists.sh
@@ -43,7 +43,15 @@
@@ -43,7 +43,15 @@ Expand_packagelist ()
\!*)
_EXEC="$(echo ${_LB_LINE} | sed -e 's|^!||')"
@ -23,11 +29,11 @@ Index: b/functions/packagelists.sh
;;
\#if\ *)
Index: b/scripts/build/lb_binary_package-lists
===================================================================
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index b3414ef..611b01f 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -41,15 +41,33 @@
@@ -41,15 +41,33 @@ Create_lockfile .lock
if ls config/package-lists/*.list > /dev/null 2>&1 || \
ls config/package-lists/*.list.binary > /dev/null 2>&1
then
@ -70,20 +76,19 @@ Index: b/scripts/build/lb_binary_package-lists
if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
then
@@ -133,11 +151,15 @@
@@ -133,11 +151,15 @@ then
rm -rf chroot/binary.deb
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
- # Removing depends
- Remove_package
-
- # Saving cache
- Save_cache cache/packages.chroot
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ # Removing depends
+ Remove_package
+
- # Saving cache
- Save_cache cache/packages.chroot
+ # Saving cache
+ Save_cache cache/packages.chroot
+ ;;
@ -91,11 +96,11 @@ Index: b/scripts/build/lb_binary_package-lists
# Creating stage file
Create_stagefile .build/binary_package-lists
Index: b/scripts/build/lb_chroot_package-lists
===================================================================
diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists
index e2dabb1..eba1cbe 100755
--- a/scripts/build/lb_chroot_package-lists
+++ b/scripts/build/lb_chroot_package-lists
@@ -46,14 +46,26 @@
@@ -46,14 +46,26 @@ if ls config/package-lists/*.list > /dev/null 2>&1 || \
ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \
ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
then
@ -130,7 +135,7 @@ Index: b/scripts/build/lb_chroot_package-lists
if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
then
@@ -76,15 +88,19 @@
@@ -76,15 +88,19 @@ then
rm -f chroot/bin/Packages

17
debian/patches/ubuntu-parent-mirror-binary-volatile.patch vendored
View File

@ -1,13 +1,16 @@
Description: Fix default for LB_PARENT_MIRROR_BINARY_VOLATILE
Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Debian: http://bugs.debian.org/685669
Last-Update: 2012-08-23
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-parent-mirror-binary-volatile
Index: b/functions/defaults.sh
===================================================================
---
functions/defaults.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 59428d2..b769bb7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -596,7 +596,7 @@
@@ -596,7 +596,7 @@ Set_defaults ()
;;
esac

43
debian/patches/ubuntu-powerpc-smp.patch vendored
View File

@ -1,25 +1,17 @@
Description: Switch Ubuntu from powerpc to powerpc-smp kernel
Author: Adam Conrad <adconrad@ubuntu.com>
Forwarded: no
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-powerpc-smp
Index: b/scripts/build/lb_binary_debian-installer
===================================================================
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -395,7 +395,7 @@
DI_REQ_PACKAGES="yaboot"
case "${LB_MODE}" in
ubuntu|kubuntu)
- DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp"
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp"
;;
*)
Index: b/functions/defaults.sh
===================================================================
---
functions/defaults.sh | 4 ++--
scripts/build/lb_binary_debian-installer | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 1ad0205..59428d2 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -803,11 +803,11 @@
@@ -803,11 +803,11 @@ Set_defaults ()
ubuntu|kubuntu)
case "${LIST}" in
stripped|minimal)
@ -33,3 +25,16 @@ Index: b/functions/defaults.sh
;;
esac
;;
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index cc94a84..b3bac4b 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -395,7 +395,7 @@ then
DI_REQ_PACKAGES="yaboot"
case "${LB_MODE}" in
ubuntu|kubuntu)
- DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp"
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp"
;;
*)

17
debian/patches/ubuntu-ppc64el-support.patch vendored
View File

@ -1,13 +1,16 @@
Description: Add basic ppc64el support
Author: Colin Watson <cjwatson@ubuntu.com>
Forwarded: no
Last-Update: 2014-01-31
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-ppc64el-support
Index: b/functions/defaults.sh
===================================================================
---
functions/defaults.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index ea30b31..ec64734 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -830,6 +830,10 @@
@@ -830,6 +830,10 @@ Set_defaults ()
esac
;;

15
debian/patches/ubuntu-pt_chown.patch vendored
View File

@ -1,8 +1,15 @@
Description: Mount devpts with gid=5,mode=620 to work without pt_chown.
Author: Adam Conrad <adconrad@ubuntu.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-pt_chown
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_devpts
+++ live-build-3.0~a57/scripts/build/lb_chroot_devpts
---
scripts/build/lb_chroot_devpts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/build/lb_chroot_devpts b/scripts/build/lb_chroot_devpts
index 6cde4f4..e2af87f 100755
--- a/scripts/build/lb_chroot_devpts
+++ b/scripts/build/lb_chroot_devpts
@@ -49,7 +49,7 @@ case "${1}" in
mkdir -p chroot/dev/pts

22
debian/patches/ubuntu-remove-non-release-lists.patch vendored
View File

@ -1,18 +1,16 @@
Description: Always remove apt lists for pockets other than the release one
The installer doesn't need non-release pocket lists and these are taking
up quite a bit of space on the media.
.
These other pockets changing quite frequently, they will usually have to
be re-downloaded by the time the system is installed anyway.
Author: Stéphane Graber <stgraber@ubuntu.com>
Origin: vendor
Last-Update: 2012-08-20
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-remove-non-release-lists
Index: b/scripts/build/lb_chroot_archives
===================================================================
---
scripts/build/lb_chroot_archives | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 304480b..9f5b458 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -881,6 +881,14 @@
@@ -881,6 +881,14 @@ EOF
mkdir -p chroot/var/lib/apt/lists/partial
fi

19
debian/patches/ubuntu-resolvconf.patch vendored
View File

@ -1,15 +1,16 @@
Description: Remove resolvconf artifacts
If chroot/etc/resolvconf/resolv.conf.d exists, tidy up the original and
tail files, which are artifacts of the build (and leak the host system's
resolv.conf).
Author: Adam Conrad <adconrad@ubuntu.com>
Last-Update: 2012-08-20
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-resolvconf
Index: b/scripts/build/lb_chroot_resolv
===================================================================
---
scripts/build/lb_chroot_resolv | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv
index 417c412..37bf8af 100755
--- a/scripts/build/lb_chroot_resolv
+++ b/scripts/build/lb_chroot_resolv
@@ -90,6 +90,12 @@
@@ -90,6 +90,12 @@ case "${1}" in
Truncate chroot/etc/resolv.conf
fi

15
debian/patches/ubuntu-s390x-support.patch vendored
View File

@ -1,8 +1,15 @@
Description: attempt s390x builds
Author: Dimitri John Ledkov <xnox@ubuntu.com>
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: ubuntu-s390x-support
--- live-build-3.0~a57.orig/functions/defaults.sh
+++ live-build-3.0~a57/functions/defaults.sh
---
functions/defaults.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index ec64734..e0646d3 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -834,6 +834,10 @@ Set_defaults ()
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
;;

17
debian/patches/ubuntu-wubi-initramfs-framebuffer.patch vendored
View File

@ -1,13 +1,16 @@
Description: Use a framebuffer in the initramfs
Wubi disk image installs do a fair amount of work in the initramfs.
Author: Evan Dandrea <ev@ubuntu.com>
Last-Update: 2012-08-20
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-wubi-initramfs-framebuffer
Index: b/scripts/build/lb_chroot_hacks
===================================================================
---
scripts/build/lb_chroot_hacks | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 06bfe50..d79ccd5 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -176,6 +176,12 @@
@@ -176,6 +176,12 @@ case "${LB_INITRAMFS}" in
;;
esac

16
debian/patches/upstart-not-in-bootstrap vendored
View File

@ -1,9 +1,15 @@
Description: Fix lb_chroot_upstart to work when upstart's not in bootstrap
Author: Adam Conrad <adconrad@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1477051
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:09 +0800
Subject: upstart-not-in-bootstrap
--- live-build-3.0~a57.orig/scripts/build/lb_chroot_upstart
+++ live-build-3.0~a57/scripts/build/lb_chroot_upstart
---
scripts/build/lb_chroot_upstart | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/lb_chroot_upstart
index 10b8899..8b7c1c4 100755
--- a/scripts/build/lb_chroot_upstart
+++ b/scripts/build/lb_chroot_upstart
@@ -27,12 +27,6 @@ Set_defaults
# Requiring stage file
Require_stagefile .build/config .build/bootstrap