From c4f058df6df45f38b1d65cc189e61d9babaee629 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 17 Dec 2013 13:22:25 +0100
Subject: [PATCH] zlib: convert to new package format for zlib:init

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/compress/zlib/package.mk             |  7 ++++
 .../initramfs/compress/zlib-initramfs/install | 28 ---------------
 .../initramfs/compress/zlib-initramfs/meta    | 36 -------------------
 3 files changed, 7 insertions(+), 64 deletions(-)
 delete mode 100755 packages/initramfs/compress/zlib-initramfs/install
 delete mode 100644 packages/initramfs/compress/zlib-initramfs/meta

diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk
index 4c9744f978..3b43bf0074 100644
--- a/packages/compress/zlib/package.mk
+++ b/packages/compress/zlib/package.mk
@@ -28,6 +28,7 @@ PKG_URL="http://www.zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS_TARGET="toolchain"
 PKG_BUILD_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_INIT=""
 PKG_PRIORITY="optional"
 PKG_SECTION="compress"
 PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
@@ -38,6 +39,7 @@ PKG_AUTORECONF="no"
 
 TARGET_CONFIGURE_OPTS="--prefix=/usr"
 HOST_CONFIGURE_OPTS="--prefix=$ROOT/$TOOLCHAIN"
+INIT_CONFIGURE_OPTS="--prefix=/"
 
 pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
@@ -48,3 +50,8 @@ pre_build_host() {
   mkdir -p $PKG_BUILD/.$HOST_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
 }
+
+pre_build_init() {
+  mkdir -p $PKG_BUILD/.$TARGET_NAME-init
+  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME-init
+}
diff --git a/packages/initramfs/compress/zlib-initramfs/install b/packages/initramfs/compress/zlib-initramfs/install
deleted file mode 100755
index d464224d8b..0000000000
--- a/packages/initramfs/compress/zlib-initramfs/install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-ZLIB_DIR="$BUILD/zlib-[0-9]*"
-
-mkdir -p $INSTALL/lib
-  cp -R $ZLIB_DIR/.install_pkg/usr/lib/*.so* $INSTALL/lib
diff --git a/packages/initramfs/compress/zlib-initramfs/meta b/packages/initramfs/compress/zlib-initramfs/meta
deleted file mode 100644
index 513c2e9881..0000000000
--- a/packages/initramfs/compress/zlib-initramfs/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, 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"