[PATCH] Make the OLPC build not depend on mkinitrd

[Andres Salomon]

Thanks, comments are inline.


On Fri, 14 Dec 2007 08:46:03 +0100
Bernardo Innocenti <bernie at codewiz.org> wrote:

> ---
>  SPECS/olpc-2.6.spec |    8 +++++++-
>  buildd.sh           |    2 +-
>  2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/SPECS/olpc-2.6.spec b/SPECS/olpc-2.6.spec
> index c823a54..2ead835 100644
> --- a/SPECS/olpc-2.6.spec
> +++ b/SPECS/olpc-2.6.spec
> @@ -15,6 +15,9 @@ Summary: The Linux kernel (the core of the Linux operating system)
>  %define buildkdump 0
>  %define buildheaders 1
>  
> +# Disable debuginfo package because it makes the build fail
> +%define _enable_debug_packages 0
> +
>  # Versions of various parts

There's no need to attempt to maintain any sort of compatibility with
the fedora kernel spec file.  Rather than unsetting variables and keeping
tons of crap in the .spec file, I'd just as soon rip out anything that's
related to _enable_debug_packages.

How does it make the build fail, though?  I haven't see that...

>  
>  # After branching, please hardcode these values as the
> @@ -213,8 +216,11 @@ Summary: The Linux kernel (the core of the Linux operating system)
>  #
>  # Packages that need to be installed before the kernel is, because the %post
>  # scripts use them.
> +# On the OLPC, we use a fancy initrd that doesn't rely on mkinitrd
> +# We drop mkinitrd because it also drags in lvm2 and other nasty dependencies
>  #
> -%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 4.2.21-1
> +%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1 \
> +	%{?!olpc:, mkinitrd >= 4.2.21-1}
>  

I just dropped the mkinitrd bit completely; no need for an OLPC test.

>  Name: kernel
>  Group: System Environment/Kernel
> diff --git a/buildd.sh b/buildd.sh
> index 24ba127..6e8de51 100755
> --- a/buildd.sh
> +++ b/buildd.sh
> @@ -7,7 +7,7 @@ GITWEB="http://dev.laptop.org/git?p=olpc-2.6"
>  if [ x"$BRANCH" = x"" ]; then
>  	BRANCH="master"
>  fi
> -BUILDDIR="/home/dilinger/public_html/builds-${BRANCH}"
> +BUILDDIR="$HOME/public_html/builds-${BRANCH}"
>  BASE="$BUILDDIR/`date '+%s'`"
>  
>  SUBLEVEL=$(wget -O- "${GITWEB};a=blob_plain;hb=${BRANCH};f=Makefile" 2>/dev/null | sed -ne 's/^.*SUBLEVEL[[:space:]]*=[[:space:]]*\([0-9]\+\).*$/\1/p')

Thanks, committed this separately.