From c6d326b73f49c84eb0751262c20cb937af8063e9 Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Fri, 20 May 2011 10:54:50 -0600 Subject: [PATCH] moving mach_kernel build into linux package so they are forced to stay in sync adding atv-bootloader into config file comments fixing blkid in initramfs to copy over necessary libs and properly work adding patch to silence screen output in mach_kernel images --- .../sysutils/util-linux-initramfs/install | 4 +++- packages/linux/build | 9 +++++++ packages/linux/install | 1 + packages/linux/meta | 7 +++++- packages/tools/atv-bootloader/build | 7 ------ .../atv-bootloader-r518-silence-output.patch | 24 +++++++++++++++++++ projects/ATV/options | 2 +- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- scripts/image_squashfs | 10 ++++---- 12 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch diff --git a/packages/initramfs/sysutils/util-linux-initramfs/install b/packages/initramfs/sysutils/util-linux-initramfs/install index 67aeeddaa2..a4366000e8 100755 --- a/packages/initramfs/sysutils/util-linux-initramfs/install +++ b/packages/initramfs/sysutils/util-linux-initramfs/install @@ -25,4 +25,6 @@ UTIL_LINUX_DIR="$BUILD/util-linux-*" mkdir -p $INSTALL/sbin - cp $UTIL_LINUX_DIR/misc-utils/blkid $INSTALL/sbin + cp $UTIL_LINUX_DIR/misc-utils/.libs/blkid $INSTALL/sbin + cp $UTIL_LINUX_DIR/shlibs/blkid/src/.libs/libblkid.so.1 $INSTALL/lib + cp $UTIL_LINUX_DIR/shlibs/uuid/src/.libs/libuuid.so.1 $INSTALL/lib diff --git a/packages/linux/build b/packages/linux/build index 5e767a82b8..456c4cc0dd 100755 --- a/packages/linux/build +++ b/packages/linux/build @@ -52,3 +52,12 @@ rm -f modules/lib/modules/*/source make $KERNEL_IMAGE +if [ "$BOOTLOADER" = "atv-bootloader" ]; then + get_version + cd $ROOT/$BUILD/atv-bootloader-* + cp -PR $ROOT/$PKG_BUILD/arch/x86/boot/bzImage vmlinuz + + make clean + make LDFLAGS="" +fi + diff --git a/packages/linux/install b/packages/linux/install index 4939a5de09..39d6a00e0d 100755 --- a/packages/linux/install +++ b/packages/linux/install @@ -45,3 +45,4 @@ mkdir -p $INSTALL/etc mkdir -p $INSTALL/etc/modprobe.d cp $PKG_DIR/modprobe.d/*.conf $INSTALL/etc/modprobe.d + diff --git a/packages/linux/meta b/packages/linux/meta index 22a879db84..39f98082cc 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -27,7 +27,8 @@ PKG_SITE="http://www.kernel.org" PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2" #PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="busybox linux-drivers linux-firmware" -PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio" +#PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio" +PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz" PKG_PRIORITY="optional" PKG_SECTION="linux" PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and modules" @@ -46,3 +47,7 @@ if [ "$LINUX" = "ti-omap4" ]; then PKG_VERSION="2.6.38-ti-omap4" PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" fi + +if [ "$BOOTLOADER" = "atv-bootloader" ]; then + PKG_DEPENDS="$PKG_DEPENDS atv-bootloader" +fi diff --git a/packages/tools/atv-bootloader/build b/packages/tools/atv-bootloader/build index a0e651676f..069c8bd21b 100755 --- a/packages/tools/atv-bootloader/build +++ b/packages/tools/atv-bootloader/build @@ -30,10 +30,3 @@ TOOLS_PREFIX="$ROOT/$BUILD" sed -i -e "s:/opt:$TOOLS_PREFIX:" Makefile -cp -PR $ROOT/$BUILD/linux-*/arch/x86/boot/bzImage vmlinuz - -make clean -make LDFLAGS="" - -cp -PR mach_kernel $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel -chmod 0644 $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel diff --git a/packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch b/packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch new file mode 100644 index 0000000000..b3401e8dd2 --- /dev/null +++ b/packages/tools/atv-bootloader/patches/atv-bootloader-r518-silence-output.patch @@ -0,0 +1,24 @@ +--- atv-bootloader-r518/console.c.orig 2011-05-19 22:48:42.582001582 -0600 ++++ atv-bootloader-r518/console.c 2011-05-19 22:49:31.014001622 -0600 +@@ -600,20 +600,7 @@ + } + + int printk(const char *szFormat, ...) { // printk displays to video +- char szBuffer[512*2]; +- u16 wLength=0; +- va_list argList; +- +- va_start(argList, szFormat); +- wLength=(u16) vsprintf(szBuffer, szFormat, argList); +- va_end(argList); +- +- szBuffer[sizeof(szBuffer)-1]=0; +- if (wLength>(sizeof(szBuffer)-1)) wLength = sizeof(szBuffer)-1; +- szBuffer[wLength]='\0'; +- +- BootVideoChunkedPrint(szBuffer); +- return wLength; ++ return 0; + } + + int console_putchar(int c) diff --git a/projects/ATV/options b/projects/ATV/options index 2fa6fd7efc..9d802a9b24 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -77,7 +77,7 @@ # Project CFLAGS PROJECT_CFLAGS="" -# Bootloader to use (syslinux / u-boot) +# Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="atv-bootloader" # Configuration for u-boot diff --git a/projects/Fusion/options b/projects/Fusion/options index f702d33622..4a1cbca68c 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -77,7 +77,7 @@ # Project CFLAGS PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe" -# Bootloader to use (syslinux / u-boot) +# Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" # Configuration for u-boot diff --git a/projects/Generic/options b/projects/Generic/options index 22242adec3..daab74bdba 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -77,7 +77,7 @@ # Project CFLAGS PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse" -# Bootloader to use (syslinux / u-boot) +# Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" # Configuration for u-boot diff --git a/projects/ION/options b/projects/ION/options index 6e188ab045..b02530737c 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -77,7 +77,7 @@ # Project CFLAGS PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe" -# Bootloader to use (syslinux / u-boot) +# Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" # Configuration for u-boot diff --git a/projects/Intel/options b/projects/Intel/options index 28126b3e77..b71cc765e3 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -77,7 +77,7 @@ # Project CFLAGS PROJECT_CFLAGS="" -# Bootloader to use (syslinux / u-boot) +# Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" # Configuration for u-boot diff --git a/scripts/image_squashfs b/scripts/image_squashfs index 8488e0f0cd..9b3fa60d53 100755 --- a/scripts/image_squashfs +++ b/scripts/image_squashfs @@ -34,6 +34,7 @@ get_version mkdir -p $TARGET_IMG rm -rf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel + rm -rf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel if [ "$BOOTLOADER" = "u-boot" ]; then KERNEL_IMAGE="uImage" else @@ -47,11 +48,12 @@ mkdir -p $TARGET_IMG fi cp -PR $BUILD/linux-*/arch/$KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.kernel - - if [ "$BOOTLOADER" = "atv-bootloader" ]; then - $SCRIPTS/build atv-bootloader - fi + if [ "$BOOTLOADER" = "atv-bootloader" ]; then + cp -PR $BUILD/atv-bootloader-*/mach_kernel $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel + chmod 0644 $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.mach_kernel + fi + echo "rm -rf $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system" >> $FAKEROOT_SCRIPT # echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system -noappend -comp xz" >> $FAKEROOT_SCRIPT echo "$ROOT/$TOOLCHAIN/bin/mksquashfs $BUILD/image/system $TARGET_IMG/$DISTRONAME-$TARGET_VERSION.system -noappend" >> $FAKEROOT_SCRIPT