Patchwork update build-mkschroot for Lucid

login
register
mail settings
Submitter John Johansen
Date Dec. 1, 2009, 6:40 p.m.
Message ID <4B156336.6090502@canonical.com>
Download mbox | patch
Permalink /patch/39927/
State Accepted
Headers show

Comments

John Johansen - Dec. 1, 2009, 6:40 p.m.
[PATCH] Update build-mkschroot for lucid

Signed-off-by: John Johansen <john.johansen@canonical.com>

---
 build-init                        |    2 +-
 build-mkschroot                   |    3 +++
 mainline-build/kernel-version-map |    1 +
 mainline-build/mainline-build     |    3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)
Stefan Bader - Dec. 1, 2009, 7:40 p.m.
John Johansen wrote:
> [PATCH] Update build-mkschroot for lucid
> 
> Signed-off-by: John Johansen <john.johansen@canonical.com>
> 
> ---
>  build-init                        |    2 +-
>  build-mkschroot                   |    3 +++
>  mainline-build/kernel-version-map |    1 +
>  mainline-build/mainline-build     |    3 ++-
>  4 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/build-init b/build-init
> index 70cd040..7fda70b 100755
> --- a/build-init
> +++ b/build-init
> @@ -19,7 +19,7 @@ fi
>  if [ ! -d "${CONFDIR}/distros" ]; then
>  	mkdir "${CONFDIR}/distros"
>  fi
> -for distro in dapper hardy intrepid jaunty karmic; do
> +for distro in dapper hardy intrepid jaunty karmic lucid; do
>  	if [ ! -f "${CONFDIR}/distros/${distro}" ]; then
>  		echo "Creating distro(${distro})"
>  		cat <<-EOD >"${CONFDIR}/distros/${distro}"
> diff --git a/build-mkschroot b/build-mkschroot
> index a03c137..e03c38e 100755
> --- a/build-mkschroot
> +++ b/build-mkschroot
> @@ -87,6 +87,9 @@ case $SUITE in
>  	karmic)
>  		ADDPKG="$ADDPKG makedumpfile"
>  		;;
> +	lucid)
> +		ADDPKG="$ADDPKG makedumpfile"
> +		;;
>  	*)
>  		if [ "$SUITE" != "" ]; then
>  			echo "Unknown suite <$SUITE>!" >&2
> diff --git a/mainline-build/kernel-version-map b/mainline-build/kernel-version-map
> index ffb8f64..3967d2a 100755
> --- a/mainline-build/kernel-version-map
> +++ b/mainline-build/kernel-version-map
> @@ -69,6 +69,7 @@ print time.strftime("%H:%M UTC", time.gmtime())
>  
>  
>  for series_name in [
> +		"Lucid Lynx",
>  		"Karmic Koala",
>  		"Jaunty Jackelope",
>  		"Intrepid Ibex",
> diff --git a/mainline-build/mainline-build b/mainline-build/mainline-build
> index 01b70a3..9cb694a 100755
> --- a/mainline-build/mainline-build
> +++ b/mainline-build/mainline-build
> @@ -27,7 +27,8 @@ case "$commit" in
>  v2.6.24*)	master_release="hardy" ;;
>  v2.6.27*)	master_release="intrepid" ;;
>  v2.6.28*|v2.6.29*|v2.6.30*)	master_release="jaunty" ;;
> -*)		master_release="karmic" ;;
> +v2.6.31*)	master_release="karmic" ;;
> +*)		master_release="lucid" ;;
>  esac
>  
>  master_repo="/srv/kernel.ubuntu.com/git/ubuntu/ubuntu-${master_release}.git"

But split into separate patches

Patch

diff --git a/build-init b/build-init
index 70cd040..7fda70b 100755
--- a/build-init
+++ b/build-init
@@ -19,7 +19,7 @@  fi
 if [ ! -d "${CONFDIR}/distros" ]; then
 	mkdir "${CONFDIR}/distros"
 fi
-for distro in dapper hardy intrepid jaunty karmic; do
+for distro in dapper hardy intrepid jaunty karmic lucid; do
 	if [ ! -f "${CONFDIR}/distros/${distro}" ]; then
 		echo "Creating distro(${distro})"
 		cat <<-EOD >"${CONFDIR}/distros/${distro}"
diff --git a/build-mkschroot b/build-mkschroot
index a03c137..e03c38e 100755
--- a/build-mkschroot
+++ b/build-mkschroot
@@ -87,6 +87,9 @@  case $SUITE in
 	karmic)
 		ADDPKG="$ADDPKG makedumpfile"
 		;;
+	lucid)
+		ADDPKG="$ADDPKG makedumpfile"
+		;;
 	*)
 		if [ "$SUITE" != "" ]; then
 			echo "Unknown suite <$SUITE>!" >&2
diff --git a/mainline-build/kernel-version-map b/mainline-build/kernel-version-map
index ffb8f64..3967d2a 100755
--- a/mainline-build/kernel-version-map
+++ b/mainline-build/kernel-version-map
@@ -69,6 +69,7 @@  print time.strftime("%H:%M UTC", time.gmtime())
 
 
 for series_name in [
+		"Lucid Lynx",
 		"Karmic Koala",
 		"Jaunty Jackelope",
 		"Intrepid Ibex",
diff --git a/mainline-build/mainline-build b/mainline-build/mainline-build
index 01b70a3..9cb694a 100755
--- a/mainline-build/mainline-build
+++ b/mainline-build/mainline-build
@@ -27,7 +27,8 @@  case "$commit" in
 v2.6.24*)	master_release="hardy" ;;
 v2.6.27*)	master_release="intrepid" ;;
 v2.6.28*|v2.6.29*|v2.6.30*)	master_release="jaunty" ;;
-*)		master_release="karmic" ;;
+v2.6.31*)	master_release="karmic" ;;
+*)		master_release="lucid" ;;
 esac
 
 master_repo="/srv/kernel.ubuntu.com/git/ubuntu/ubuntu-${master_release}.git"