ci-test-sample/debian/patches/ubuntu-i386-generic-pae.patch

50 lines
1.3 KiB
Diff
Raw Normal View History

2017-07-18 17:26:34 +08:00
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 18 Jul 2017 17:21:08 +0800
Subject: ubuntu-i386-generic-pae
2017-07-18 17:26:34 +08:00
---
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
2017-07-18 17:26:34 +08:00
@@ -748,7 +748,14 @@ Set_defaults ()
;;
ubuntu|kubuntu)
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+ case "${LB_DISTRIBUTION}" in
+ precise)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
+ ;;
+ *)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+ ;;
+ esac
;;
*)
2017-07-18 17:26:34 +08:00
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
2017-07-18 17:26:34 +08:00
@@ -362,7 +362,14 @@ then
case "${LB_MODE}" in
ubuntu|kubuntu)
- DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+ case "${LB_DISTRIBUTION}" in
+ precise)
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
+ ;;
+ *)
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+ ;;
+ esac
;;
*)