update to ubuntu33
This commit is contained in:
谢炜
parent
04095b72e2
commit
5155f12573
|
|
@ -0,0 +1,30 @@
|
||||||
|
From: =?utf-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
|
||||||
|
Date: Fri, 30 Mar 2018 11:39:26 +0800
|
||||||
|
Subject: ubuntu-initramfs-compression-symlinks
|
||||||
|
|
||||||
|
---
|
||||||
|
scripts/build/lb_chroot_hacks | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
|
||||||
|
index 5756971..997f5ba 100755
|
||||||
|
--- a/scripts/build/lb_chroot_hacks
|
||||||
|
+++ b/scripts/build/lb_chroot_hacks
|
||||||
|
@@ -195,7 +195,7 @@ case "${LB_INITRAMFS_COMPRESSION}" in
|
||||||
|
;;
|
||||||
|
|
||||||
|
bzip2)
|
||||||
|
- for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
|
||||||
|
+ for INITRAMFS in $(find chroot/boot -name 'initrd*' -not -type l); do
|
||||||
|
zcat "${INITRAMFS}" | bzip2 -c ${BZIP2_OPTIONS} > "${INITRAMFS}.new"
|
||||||
|
mv "${INITRAMFS}.new" "${INITRAMFS}"
|
||||||
|
done
|
||||||
|
@@ -205,7 +205,7 @@ case "${LB_INITRAMFS_COMPRESSION}" in
|
||||||
|
# We probably ought to use COMPRESS= in a temporary file in
|
||||||
|
# /etc/initramfs-tools/conf.d/ instead, but it's hard to
|
||||||
|
# pass options that way.
|
||||||
|
- for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
|
||||||
|
+ for INITRAMFS in $(find chroot/boot -name 'initrd*' -not -type l); do
|
||||||
|
zcat "${INITRAMFS}" | lzma -c ${LZMA_OPTIONS} > "${INITRAMFS}.new"
|
||||||
|
mv "${INITRAMFS}.new" "${INITRAMFS}"
|
||||||
|
done
|
||||||
|
|
@ -0,0 +1,33 @@
|
||||||
|
From: =?utf-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
|
||||||
|
Date: Fri, 30 Mar 2018 11:40:21 +0800
|
||||||
|
Subject: ubuntu-no-sysvinit-fixups
|
||||||
|
|
||||||
|
---
|
||||||
|
scripts/build/lb_chroot_live-packages | 14 --------------
|
||||||
|
1 file changed, 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/lb_chroot_live-packages
|
||||||
|
index 0e4ff44..e8ba0a1 100755
|
||||||
|
--- a/scripts/build/lb_chroot_live-packages
|
||||||
|
+++ b/scripts/build/lb_chroot_live-packages
|
||||||
|
@@ -48,20 +48,6 @@ then
|
||||||
|
_PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
-# Do initsystem specific hacks
|
||||||
|
-if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "sysvinit" ]
|
||||||
|
-then
|
||||||
|
- # lets see if we still need the squeeze's "pre init system policy discussion" hack:
|
||||||
|
- IS_SYSVINIT_ESSENTIAL="$(Chroot chroot dpkg-query --show --showformat='${Essential}\n' sysvinit)"
|
||||||
|
- RC="$?"
|
||||||
|
-
|
||||||
|
- if [ "${IS_SYSVINIT_ESSENTIAL}" != "no" ] && [ "${RC}" = "0" ]
|
||||||
|
- then
|
||||||
|
- # sysvinit is both installed and essential, ugly hack to remove it
|
||||||
|
- Chroot chroot dpkg --force-remove-essential --remove sysvinit || true
|
||||||
|
- fi
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
# Install live packages
|
||||||
|
if [ -n "${_PACKAGES}" ]
|
||||||
|
then
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
From: =?utf-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
|
||||||
|
Date: Fri, 30 Mar 2018 11:40:48 +0800
|
||||||
|
Subject: skip-missing-initrd
|
||||||
|
|
||||||
|
---
|
||||||
|
scripts/build/lb_binary_linux-image | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image
|
||||||
|
index e36b54b..11b304e 100755
|
||||||
|
--- a/scripts/build/lb_binary_linux-image
|
||||||
|
+++ b/scripts/build/lb_binary_linux-image
|
||||||
|
@@ -76,7 +76,7 @@ mkdir -p "${DESTDIR}"
|
||||||
|
if [ "${LB_LINUX_PACKAGES}" != "none" ]
|
||||||
|
then
|
||||||
|
cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
|
||||||
|
- cp chroot/boot/initrd.img-* "${DESTDIR}"
|
||||||
|
+ cp chroot/boot/initrd.img-* "${DESTDIR}" 2>&1 || Echo_message "Skipped installing missing initrd."
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "${LB_INITRAMFS}" in
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
From: =?utf-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
|
||||||
|
Date: Fri, 30 Mar 2018 11:41:52 +0800
|
||||||
|
Subject: ubuntu-no-gnupg-hardcode
|
||||||
|
|
||||||
|
---
|
||||||
|
functions/defaults.sh | 8 --------
|
||||||
|
1 file changed, 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/functions/defaults.sh b/functions/defaults.sh
|
||||||
|
index e0646d3..9368a9d 100755
|
||||||
|
--- a/functions/defaults.sh
|
||||||
|
+++ b/functions/defaults.sh
|
||||||
|
@@ -377,14 +377,6 @@ Set_defaults ()
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
- # Include packages on base
|
||||||
|
- case "${LB_MODE}" in
|
||||||
|
- ubuntu|kubuntu)
|
||||||
|
- LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE:-gnupg}"
|
||||||
|
- ;;
|
||||||
|
-
|
||||||
|
- esac
|
||||||
|
-
|
||||||
|
# Exclude packages on base
|
||||||
|
# LB_BOOTSTRAP_EXCLUDE
|
||||||
|
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
From: =?utf-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
|
||||||
|
Date: Fri, 30 Mar 2018 11:42:23 +0800
|
||||||
|
Subject: no-apt-key
|
||||||
|
|
||||||
|
---
|
||||||
|
scripts/build/lb_chroot_archives | 12 +++++-------
|
||||||
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
|
||||||
|
index 5976cd8..0759411 100755
|
||||||
|
--- a/scripts/build/lb_chroot_archives
|
||||||
|
+++ b/scripts/build/lb_chroot_archives
|
||||||
|
@@ -249,10 +249,10 @@ EOF
|
||||||
|
# Adding archive signing keys (chroot)
|
||||||
|
if [ -e "${_BASE}/archives/${REPOSITORY}.key.chroot" ]
|
||||||
|
then
|
||||||
|
- cat "${_BASE}/archives/${REPOSITORY}.key.chroot" | Chroot chroot "apt-key add -"
|
||||||
|
+ cp "${_BASE}/archives/${REPOSITORY}.key.chroot" chroot/etc/apt/trusted.gpg.d/${REPOSITORY}.gpg
|
||||||
|
elif [ -e "${_BASE}/archives/${REPOSITORY}.key" ]
|
||||||
|
then
|
||||||
|
- cat "${_BASE}/archives/${REPOSITORY}.key" | Chroot chroot "apt-key add -"
|
||||||
|
+ cp "${_BASE}/archives/${REPOSITORY}.key" chroot/etc/apt/trusted.gpg.d/${REPOSITORY}.gpg
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
@@ -516,9 +516,7 @@ EOF
|
||||||
|
do
|
||||||
|
if [ -e "${FILE}" ]
|
||||||
|
then
|
||||||
|
- cp ${FILE} chroot/root
|
||||||
|
- Chroot chroot "apt-key add /root/$(basename ${FILE})"
|
||||||
|
- rm -f chroot/root/$(basename ${FILE})
|
||||||
|
+ cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
@@ -804,10 +802,10 @@ EOF
|
||||||
|
# Adding archive signing keys (binary)
|
||||||
|
if [ -e "${_BASE}/archives/${REPOSITORY}.key.binary" ]
|
||||||
|
then
|
||||||
|
- cat "${_BASE}/archives/${REPOSITORY}.key.binary" | Chroot chroot "apt-key add -"
|
||||||
|
+ cp "${_BASE}/archives/${REPOSITORY}.key.binary" chroot/etc/apt/trusted.gpg.d/${REPOSITORY}.gpg
|
||||||
|
elif [ -e "${_BASE}/archives/${REPOSITORY}.key" ]
|
||||||
|
then
|
||||||
|
- cat "${_BASE}/archives/${REPOSITORY}.key" | Chroot chroot "apt-key add -"
|
||||||
|
+ cat "${_BASE}/archives/${REPOSITORY}.key" chroot/etc/apt/trusted.gpg.d/${REPOSITORY}.gpg
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
From: =?utf-8?q?=E8=B0=A2=E7=82=9C?= <xiewei@kylinos.cn>
|
||||||
|
Date: Fri, 30 Mar 2018 11:58:10 +0800
|
||||||
|
Subject: kylin-add-beijing-bionic
|
||||||
|
|
||||||
|
---
|
||||||
|
functions/releases.sh | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/functions/releases.sh b/functions/releases.sh
|
||||||
|
index 45645fe..21bd871 100755
|
||||||
|
--- a/functions/releases.sh
|
||||||
|
+++ b/functions/releases.sh
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
RELEASE_squeeze="6.0.5"
|
||||||
|
RELEASE_wheezy="7.0.0"
|
||||||
|
RELEASE_jessie="8"
|
||||||
|
+RELEASE_stretch="9"
|
||||||
|
RELEASE_sid="unstable"
|
||||||
|
|
||||||
|
# Progress releases
|
||||||
|
@@ -35,3 +36,6 @@ RELEASE_xenial="16.04" # LTS
|
||||||
|
RELEASE_juniper="4.0" # kylin juniper
|
||||||
|
RELEASE_yakkety="16.10" # 2016-10-01
|
||||||
|
RELEASE_zesty="17.04" # 2017-04-01
|
||||||
|
+RELEASE_artful="17.10" # 2017-10-01
|
||||||
|
+RELEASE_bionic="18.04" # LTS
|
||||||
|
+RELEASE_beijing="4.0" # kylin beijing
|
||||||
|
|
@ -58,3 +58,9 @@ strip-pool-for-di.patch
|
||||||
0058-kylin-get-udeb.patch
|
0058-kylin-get-udeb.patch
|
||||||
0059-fix-kylin-get-udeb.patch
|
0059-fix-kylin-get-udeb.patch
|
||||||
0060-fix-variable-conflict.patch
|
0060-fix-variable-conflict.patch
|
||||||
|
0061-ubuntu-initramfs-compression-symlinks.patch
|
||||||
|
0062-ubuntu-no-sysvinit-fixups.patch
|
||||||
|
0063-skip-missing-initrd.patch
|
||||||
|
0064-ubuntu-no-gnupg-hardcode.patch
|
||||||
|
0065-no-apt-key.patch
|
||||||
|
0066-kylin-add-beijing-bionic.patch
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue