[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] Correctly set default categories for Ubuntu



Hello,

 When I've been doing different tests with the Ubuntu mode, I've been specifying additional components to lh_config which is why I didn't catch that "lh_config --mode ubuntu" will generate configuration that will fail to build as linux-generic is in the restricted component of the Ubuntu archive as it depends on Ubuntu's linux restricted modules package. To fix this, I've created a patch to set the default value for LH_CATEGORIES when running in Ubuntu mode to enable both main and restricted which is the same set of components enabled for the official Ubuntu CD builds.

Cheers,

--
Cody A.W. Somerville
Software Systems Release Engineer
Foundations Team
Custom Engineering Solutions Group
Canonical OEM Services
Phone: +1-781-850-2087
Cell: +1-506-471-8402
Email: cody.somerville@canonical.com
From 1744de7713f03f47d72031e3fe66c138a08e69a9 Mon Sep 17 00:00:00 2001
From: Cody A.W. Somerville <cody.somerville@canonical.com>
Date: Fri, 17 Apr 2009 15:32:15 -0300
Subject: [PATCH] Update defaults.sh to correctly set default LH_CATEGORIES when in Ubuntu mode.

---
 functions/defaults.sh |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5f5deef..8ad360f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -406,7 +406,15 @@ Set_defaults ()
 	# Setting categories value
 	if [ -z "${LH_CATEGORIES}" ]
 	then
-		LH_CATEGORIES="main"
+		case "${LH_MODE}" in
+			ubuntu)
+				LH_CATEGORIES="main restricted"
+				;;
+
+			*)
+				LH_CATEGORIES="main"
+				;;
+		esac
 	fi
 
 	## config/chroot
-- 
1.6.0.4


Reply to: