From 0e13d029cab565c384b6de8aef28244446d7d8db Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:11:23 +0200 Subject: [PATCH 1/9] new package: add subpackage 'zlib-initramfs' Signed-off-by: Stephan Raue --- .../initramfs/compress/zlib-initramfs/install | 28 +++++++++++++++ .../initramfs/compress/zlib-initramfs/meta | 36 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100755 packages/initramfs/compress/zlib-initramfs/install create mode 100644 packages/initramfs/compress/zlib-initramfs/meta diff --git a/packages/initramfs/compress/zlib-initramfs/install b/packages/initramfs/compress/zlib-initramfs/install new file mode 100755 index 0000000000..6c59423c48 --- /dev/null +++ b/packages/initramfs/compress/zlib-initramfs/install @@ -0,0 +1,28 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +ZLIB_DIR="$BUILD/zlib-*" + +mkdir -p $INSTALL/lib + cp -R $ZLIB_DIR/*.so* $INSTALL/lib diff --git a/packages/initramfs/compress/zlib-initramfs/meta b/packages/initramfs/compress/zlib-initramfs/meta new file mode 100644 index 0000000000..a8cb1fd381 --- /dev/null +++ b/packages/initramfs/compress/zlib-initramfs/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="zlib-initramfs" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.zlib.net" +PKG_URL="" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain zlib" +PKG_PRIORITY="optional" +PKG_SECTION="initramfs/compress" +PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library" +PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From 02ba3f01043a06989150aeedfe13a3298d59ead5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:11:39 +0200 Subject: [PATCH 2/9] new package: add subpackage 'eglibc-initramfs' Signed-off-by: Stephan Raue --- .../initramfs/devel/eglibc-initramfs/install | 30 ++++++++++++++++ .../initramfs/devel/eglibc-initramfs/meta | 36 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100755 packages/initramfs/devel/eglibc-initramfs/install create mode 100644 packages/initramfs/devel/eglibc-initramfs/meta diff --git a/packages/initramfs/devel/eglibc-initramfs/install b/packages/initramfs/devel/eglibc-initramfs/install new file mode 100755 index 0000000000..fff49ebbbd --- /dev/null +++ b/packages/initramfs/devel/eglibc-initramfs/install @@ -0,0 +1,30 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +EGLIBC_DIR="$BUILD/eglibc-*" + +mkdir -p $INSTALL/lib + cp $EGLIBC_DIR/objdir-eglibc/elf/ld*.so.* $INSTALL/lib + cp $EGLIBC_DIR/objdir-eglibc/libc.so.6 $INSTALL/lib + cp $EGLIBC_DIR/objdir-eglibc/math/libm.so.6 $INSTALL/lib diff --git a/packages/initramfs/devel/eglibc-initramfs/meta b/packages/initramfs/devel/eglibc-initramfs/meta new file mode 100644 index 0000000000..831345f6f9 --- /dev/null +++ b/packages/initramfs/devel/eglibc-initramfs/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="eglibc-initramfs" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.eglibc.org/" +PKG_URL="" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="eglibc" +PKG_PRIORITY="optional" +PKG_SECTION="initramfs/devel" +PKG_SHORTDESC="eglibc: The Embedded GNU C library" +PKG_LONGDESC="The Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC) that is designed to work well on embedded systems. EGLIBC strives to be source and binary compatible with GLIBC. EGLIBC's goals include reduced footprint, configurable components, better support for cross-compilation and cross-testing. In contrast to what Ulrich Drepper makes out of GLIBC, in EGLIBC all patches assigned to the FSF will be considered regardless of individual or company affiliation and cooperation is encouraged, as well as communication, civility, and respect among developers." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From c34416a8cacf08d981da6f620648b97d6e84c723 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:12:01 +0200 Subject: [PATCH 3/9] new package: add subpackage 'libpng-initramfs' Signed-off-by: Stephan Raue --- .../graphics/libpng-initramfs/install | 28 +++++++++++++++ .../initramfs/graphics/libpng-initramfs/meta | 36 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100755 packages/initramfs/graphics/libpng-initramfs/install create mode 100644 packages/initramfs/graphics/libpng-initramfs/meta diff --git a/packages/initramfs/graphics/libpng-initramfs/install b/packages/initramfs/graphics/libpng-initramfs/install new file mode 100755 index 0000000000..7439cd14b9 --- /dev/null +++ b/packages/initramfs/graphics/libpng-initramfs/install @@ -0,0 +1,28 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +LIBPNG_DIR="$BUILD/libpng-*" + +mkdir -p $INSTALL/lib + cp -P $LIBPNG_DIR/.libs/libpng*.so* $INSTALL/lib diff --git a/packages/initramfs/graphics/libpng-initramfs/meta b/packages/initramfs/graphics/libpng-initramfs/meta new file mode 100644 index 0000000000..48c1d61dfa --- /dev/null +++ b/packages/initramfs/graphics/libpng-initramfs/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="libpng-initramfs" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.libpng.org/" +PKG_URL="" +PKG_DEPENDS="zlib-initramfs" +PKG_BUILD_DEPENDS="toolchain libpng" +PKG_PRIORITY="optional" +PKG_SECTION="initramfs/graphics" +PKG_SHORTDESC="libpng: Portable Network Graphics (PNG) Reference Library" +PKG_LONGDESC="PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From 88fea3a891367bc8310550426a0ff8fc3ed94dc5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:12:20 +0200 Subject: [PATCH 4/9] new package: add subpackage 'gcc-initramfs' Signed-off-by: Stephan Raue --- packages/initramfs/lang/gcc-initramfs/install | 28 +++++++++++++++ packages/initramfs/lang/gcc-initramfs/meta | 36 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100755 packages/initramfs/lang/gcc-initramfs/install create mode 100644 packages/initramfs/lang/gcc-initramfs/meta diff --git a/packages/initramfs/lang/gcc-initramfs/install b/packages/initramfs/lang/gcc-initramfs/install new file mode 100755 index 0000000000..ed5c5b017b --- /dev/null +++ b/packages/initramfs/lang/gcc-initramfs/install @@ -0,0 +1,28 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +GCC_DIR="$BUILD/gcc-*" + +mkdir -p $INSTALL/lib + cp -P $GCC_DIR/objdir-gcc-final/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/lib diff --git a/packages/initramfs/lang/gcc-initramfs/meta b/packages/initramfs/lang/gcc-initramfs/meta new file mode 100644 index 0000000000..32e61a28d6 --- /dev/null +++ b/packages/initramfs/lang/gcc-initramfs/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="gcc-initramfs" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://gcc.gnu.org/" +PKG_URL="" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="gcc-final" +PKG_PRIORITY="optional" +PKG_SECTION="initramfs/lang" +PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)" +PKG_LONGDESC="This package contains the GNU Compiler Collection. It includes compilers for the languages C, C++, Objective C, Fortran 95, Java and others ... This GCC contains the Stack-Smashing Protector Patch which can be enabled with the -fstack-protector command-line option. More information about it ca be found at http://www.research.ibm.com/trl/projects/security/ssp/." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From 8ae68fc2532520f96329e5977048644b93211e4c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:13:42 +0200 Subject: [PATCH 5/9] new package: add subpackage 'diskdev_cmds-initramfs' Signed-off-by: Stephan Raue --- .../sysutils/diskdev_cmds-initramfs/install | 30 ++++++++++++++++ .../sysutils/diskdev_cmds-initramfs/meta | 36 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100755 packages/initramfs/sysutils/diskdev_cmds-initramfs/install create mode 100644 packages/initramfs/sysutils/diskdev_cmds-initramfs/meta diff --git a/packages/initramfs/sysutils/diskdev_cmds-initramfs/install b/packages/initramfs/sysutils/diskdev_cmds-initramfs/install new file mode 100755 index 0000000000..3e4e3ef6e3 --- /dev/null +++ b/packages/initramfs/sysutils/diskdev_cmds-initramfs/install @@ -0,0 +1,30 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +DISKDEV_CMDS_DIR="$BUILD/diskdev_cmds-*" + +mkdir -p $INSTALL/sbin + cp $DISKDEV_CMDS_DIR/fsck_hfs.tproj/fsck_hfs $INSTALL/sbin + ln -sf fsck_hfs $INSTALL/sbin/fsck.hfs + ln -sf fsck_hfs $INSTALL/sbin/fsck.hfsplus diff --git a/packages/initramfs/sysutils/diskdev_cmds-initramfs/meta b/packages/initramfs/sysutils/diskdev_cmds-initramfs/meta new file mode 100644 index 0000000000..48bc6a8006 --- /dev/null +++ b/packages/initramfs/sysutils/diskdev_cmds-initramfs/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="diskdev_cmds-initramfs" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="APSL" +PKG_SITE="http://src.gnu-darwin.org/DarwinSourceArchive/expanded/diskdev_cmds/" +PKG_URL="" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain diskdev_cmds" +PKG_PRIORITY="optional" +PKG_SECTION="initramfs/system" +PKG_SHORTDESC="diskdev_cmds: hfs filesystem utilities" +PKG_LONGDESC="The fsck and mkfs utliities for hfs and hfsplus filesystems." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" From 6d657762f419e95008676e7ad760d8a09a49503a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:14:34 +0200 Subject: [PATCH 6/9] busybox-initramfs: move to packages/initramfs Signed-off-by: Stephan Raue --- .../sysutils/busybox-initramfs/build | 0 .../config/busybox-initramfs.conf | 6 +++--- .../sysutils/busybox-initramfs/install | 16 +++++++++++----- .../sysutils/busybox-initramfs/meta | 0 .../sysutils/busybox-initramfs/scripts/init | 0 5 files changed, 14 insertions(+), 8 deletions(-) rename packages/{ => initramfs}/sysutils/busybox-initramfs/build (100%) rename packages/{ => initramfs}/sysutils/busybox-initramfs/config/busybox-initramfs.conf (99%) rename packages/{ => initramfs}/sysutils/busybox-initramfs/install (79%) rename packages/{ => initramfs}/sysutils/busybox-initramfs/meta (100%) rename packages/{ => initramfs}/sysutils/busybox-initramfs/scripts/init (100%) diff --git a/packages/sysutils/busybox-initramfs/build b/packages/initramfs/sysutils/busybox-initramfs/build similarity index 100% rename from packages/sysutils/busybox-initramfs/build rename to packages/initramfs/sysutils/busybox-initramfs/build diff --git a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf b/packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf similarity index 99% rename from packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf rename to packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf index 0d3038fa5e..041e93cfe2 100644 --- a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf +++ b/packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.0 -# Tue Nov 23 18:27:38 2010 +# Busybox version: 1.18.4 +# Tue May 17 21:21:08 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -54,7 +54,7 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # # Build Options # -CONFIG_STATIC=y +# CONFIG_STATIC is not set # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set diff --git a/packages/sysutils/busybox-initramfs/install b/packages/initramfs/sysutils/busybox-initramfs/install similarity index 79% rename from packages/sysutils/busybox-initramfs/install rename to packages/initramfs/sysutils/busybox-initramfs/install index e463324635..272e82f227 100755 --- a/packages/sysutils/busybox-initramfs/install +++ b/packages/initramfs/sysutils/busybox-initramfs/install @@ -22,11 +22,17 @@ . config/options $1 -$SCRIPTS/unpack linux -$SCRIPTS/install plymouth-lite - - mkdir -p $INSTALL - cp -PR $BUILD/busybox*/_install-initramfs/* $INSTALL +mkdir -p $INSTALL/bin + cp -PR $BUILD/busybox*/_install-initramfs/bin/busybox $INSTALL/bin + ln -sf busybox $INSTALL/bin/sh chmod 4755 $INSTALL/bin/busybox +mkdir -p $INSTALL/dev +mkdir -p $INSTALL/proc +mkdir -p $INSTALL/sys +mkdir -p $INSTALL/flash +mkdir -p $INSTALL/sysroot +mkdir -p $INSTALL/storage + cp $PKG_DIR/scripts/init $INSTALL + chmod 755 $INSTALL/init diff --git a/packages/sysutils/busybox-initramfs/meta b/packages/initramfs/sysutils/busybox-initramfs/meta similarity index 100% rename from packages/sysutils/busybox-initramfs/meta rename to packages/initramfs/sysutils/busybox-initramfs/meta diff --git a/packages/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init similarity index 100% rename from packages/sysutils/busybox-initramfs/scripts/init rename to packages/initramfs/sysutils/busybox-initramfs/scripts/init From d9ed48a45944277d465238feea548ebc56e1e91a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:15:02 +0200 Subject: [PATCH 7/9] plymouth-lite: move to packages/initramfs Signed-off-by: Stephan Raue --- .../{ => initramfs}/sysutils/plymouth-lite/build | 0 .../{ => initramfs}/sysutils/plymouth-lite/install | 0 .../{ => initramfs}/sysutils/plymouth-lite/meta | 2 +- .../patches/plymouth-lite-0.6.0-cursor.patch | 0 .../patches/plymouth-lite-0.6.0-fix-build.patch | 2 +- .../patches/plymouth-lite-0.6.0-libpng_1.4.0.patch | 0 .../patches/plymouth-lite-0.6.0-resize.patch | 0 .../sysutils/plymouth-lite/splash/splash.png | Bin .../sysutils/plymouth-lite/splash/splash1.png | Bin 9 files changed, 2 insertions(+), 2 deletions(-) rename packages/{ => initramfs}/sysutils/plymouth-lite/build (100%) rename packages/{ => initramfs}/sysutils/plymouth-lite/install (100%) rename packages/{ => initramfs}/sysutils/plymouth-lite/meta (97%) rename packages/{ => initramfs}/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-cursor.patch (100%) rename packages/{ => initramfs}/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-fix-build.patch (73%) rename packages/{ => initramfs}/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-libpng_1.4.0.patch (100%) rename packages/{ => initramfs}/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-resize.patch (100%) rename packages/{ => initramfs}/sysutils/plymouth-lite/splash/splash.png (100%) rename packages/{ => initramfs}/sysutils/plymouth-lite/splash/splash1.png (100%) diff --git a/packages/sysutils/plymouth-lite/build b/packages/initramfs/sysutils/plymouth-lite/build similarity index 100% rename from packages/sysutils/plymouth-lite/build rename to packages/initramfs/sysutils/plymouth-lite/build diff --git a/packages/sysutils/plymouth-lite/install b/packages/initramfs/sysutils/plymouth-lite/install similarity index 100% rename from packages/sysutils/plymouth-lite/install rename to packages/initramfs/sysutils/plymouth-lite/install diff --git a/packages/sysutils/plymouth-lite/meta b/packages/initramfs/sysutils/plymouth-lite/meta similarity index 97% rename from packages/sysutils/plymouth-lite/meta rename to packages/initramfs/sysutils/plymouth-lite/meta index 05a24bfc2d..fea59ea025 100644 --- a/packages/sysutils/plymouth-lite/meta +++ b/packages/initramfs/sysutils/plymouth-lite/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.meego.com" PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" +PKG_DEPENDS="gcc-initramfs libpng-initramfs" PKG_BUILD_DEPENDS="toolchain libpng" PKG_PRIORITY="optional" PKG_SECTION="system" diff --git a/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-cursor.patch b/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-cursor.patch similarity index 100% rename from packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-cursor.patch rename to packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-cursor.patch diff --git a/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-fix-build.patch b/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-fix-build.patch similarity index 73% rename from packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-fix-build.patch rename to packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-fix-build.patch index 5525d629ca..f9baa38536 100644 --- a/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-fix-build.patch +++ b/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-fix-build.patch @@ -4,7 +4,7 @@ ply-image: ply-image.c ply-frame-buffer.c Makefile - gcc -O2 -march=core2 -mtune=generic -lm `pkg-config --cflags libpng12` `pkg-config --libs libpng12` ply-image.c ply-frame-buffer.c -o ply-image -+ $(CC) -static $(CFLAGS) `pkg-config --cflags libpng` ply-image.c ply-frame-buffer.c -o ply-image -lm `pkg-config --libs libpng` -lm -lz ++ $(CC) $(CFLAGS) `pkg-config --cflags libpng` ply-image.c ply-frame-buffer.c -o ply-image -lm `pkg-config --libs libpng` -lm -lz clean: rm -f ply-image *~ gmon.out diff --git a/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-libpng_1.4.0.patch b/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-libpng_1.4.0.patch similarity index 100% rename from packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-libpng_1.4.0.patch rename to packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-libpng_1.4.0.patch diff --git a/packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-resize.patch b/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-resize.patch similarity index 100% rename from packages/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-resize.patch rename to packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-resize.patch diff --git a/packages/sysutils/plymouth-lite/splash/splash.png b/packages/initramfs/sysutils/plymouth-lite/splash/splash.png similarity index 100% rename from packages/sysutils/plymouth-lite/splash/splash.png rename to packages/initramfs/sysutils/plymouth-lite/splash/splash.png diff --git a/packages/sysutils/plymouth-lite/splash/splash1.png b/packages/initramfs/sysutils/plymouth-lite/splash/splash1.png similarity index 100% rename from packages/sysutils/plymouth-lite/splash/splash1.png rename to packages/initramfs/sysutils/plymouth-lite/splash/splash1.png From 4fae2dfe37b12d08688fe41fea4c45bb85d6acee Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:16:47 +0200 Subject: [PATCH 8/9] new package: add package 'initramfs' for building a shared linked initramfs Signed-off-by: Stephan Raue --- packages/initramfs/meta | 40 ++++++++++++++++++++++++++++++++++++++++ packages/linux/build | 9 +++++++-- packages/linux/unpack | 3 ++- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 packages/initramfs/meta diff --git a/packages/initramfs/meta b/packages/initramfs/meta new file mode 100644 index 0000000000..06f1b882a8 --- /dev/null +++ b/packages/initramfs/meta @@ -0,0 +1,40 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="initramfs" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.openelec.tv" +PKG_URL="" +PKG_DEPENDS="eglibc-initramfs busybox-initramfs plymouth-lite diskdev_cmds-initramfs" +PKG_BUILD_DEPENDS="toolchain eglibc-initramfs busybox-initramfs plymouth-lite" +PKG_PRIORITY="optional" +PKG_SECTION="initramfs" +PKG_SHORTDESC="initramfs: Metapackage for installing initramfs" +PKG_LONGDESC="debug is a Metapackage for installing initramfs" +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" + +if [ "$HFSTOOLS" = "yes" ]; then + PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs" +fi diff --git a/packages/linux/build b/packages/linux/build index ed0d622184..e83c67c093 100755 --- a/packages/linux/build +++ b/packages/linux/build @@ -22,8 +22,13 @@ . config/options $1 -export INSTALL=$(kernel_path)/initramfs -$SCRIPTS/install busybox-initramfs +# export INSTALL=$(kernel_path)/initramfs +export INSTALL=$ROOT/$BUILD/image/initramfs/root-image +$SCRIPTS/install initramfs + +cd $INSTALL + find . | cpio -H newc -ov -R 0:0 > $ROOT/$BUILD/image/initramfs.cpio +cd - if [ "$BOOTLOADER" = "u-boot" ]; then $SCRIPTS/build u-boot diff --git a/packages/linux/unpack b/packages/linux/unpack index 37fe003e97..9523cd3a1a 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -37,7 +37,8 @@ sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \ $LINUX/Makefile cp $KERNEL_CFG_FILE $LINUX/.config -sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$PKG_DIR/config/initramfs\"|" \ +#sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$PKG_DIR/config/initramfs\"|" \ +sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \ $LINUX/.config # copy some extra firmware to linux tree From 03b34829b5f33f1b6ba8bbfddd38e324cd894963 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 18 May 2011 01:20:31 +0200 Subject: [PATCH 9/9] initramfs: fix dependencies Signed-off-by: Stephan Raue --- packages/initramfs/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/initramfs/meta b/packages/initramfs/meta index 06f1b882a8..6bbab40a01 100644 --- a/packages/initramfs/meta +++ b/packages/initramfs/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS="eglibc-initramfs busybox-initramfs plymouth-lite diskdev_cmds-initramfs" +PKG_DEPENDS="eglibc-initramfs busybox-initramfs plymouth-lite" PKG_BUILD_DEPENDS="toolchain eglibc-initramfs busybox-initramfs plymouth-lite" PKG_PRIORITY="optional" PKG_SECTION="initramfs"