From 72c017fe1e37202bfdf19c29f655810034ac8e49 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 17 Dec 2013 13:20:36 +0100 Subject: [PATCH] open-iscsi: convert to new package format Signed-off-by: Stephan Raue --- packages/initramfs/package.mk | 8 +++-- packages/initramfs/sysutils/open-iscsi/build | 34 ------------------- .../initramfs/sysutils/open-iscsi/install | 29 ---------------- .../meta => sysutils/open-iscsi/package.mk} | 23 +++++++++++-- ...n-iscsi-01_dynamic_linked_iscsistart.patch | 0 .../patches/open-iscsi-02-cross_compile.patch | 0 .../open-iscsi-03_enable-multicast.patch | 0 .../patches/open-iscsi-04-no_iscsiuio.patch | 0 8 files changed, 26 insertions(+), 68 deletions(-) delete mode 100755 packages/initramfs/sysutils/open-iscsi/build delete mode 100755 packages/initramfs/sysutils/open-iscsi/install rename packages/{initramfs/sysutils/open-iscsi/meta => sysutils/open-iscsi/package.mk} (79%) rename packages/{initramfs => }/sysutils/open-iscsi/patches/open-iscsi-01_dynamic_linked_iscsistart.patch (100%) rename packages/{initramfs => }/sysutils/open-iscsi/patches/open-iscsi-02-cross_compile.patch (100%) rename packages/{initramfs => }/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch (100%) rename packages/{initramfs => }/sysutils/open-iscsi/patches/open-iscsi-04-no_iscsiuio.patch (100%) diff --git a/packages/initramfs/package.mk b/packages/initramfs/package.mk index 8f1eb2bd95..0c01466e41 100644 --- a/packages/initramfs/package.mk +++ b/packages/initramfs/package.mk @@ -36,10 +36,12 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" if [ "$ISCSI_SUPPORT" = yes ]; then - PKG_DEPENDS="$PKG_DEPENDS open-iscsi" + PKG_DEPENDS="$PKG_DEPENDS open-iscsi:init" fi -makeinstall_target() { - cd $INSTALL_INIT +post_install() { + cd $ROOT/$BUILD/initramfs + mkdir -p $ROOT/$BUILD/image/ find . | cpio -H newc -ov -R 0:0 > $ROOT/$BUILD/image/initramfs.cpio + cd - } diff --git a/packages/initramfs/sysutils/open-iscsi/build b/packages/initramfs/sysutils/open-iscsi/build deleted file mode 100755 index bc3a2ff347..0000000000 --- a/packages/initramfs/sysutils/open-iscsi/build +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2012 Yann Cézard (eesprit@free.fr) -# -# 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 - -export OPTFLAGS="$CFLAGS $LDFLAGS" - -cd $PKG_BUILD/utils/open-isns -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --with-security=no \ - -cd ../.. -make user diff --git a/packages/initramfs/sysutils/open-iscsi/install b/packages/initramfs/sysutils/open-iscsi/install deleted file mode 100755 index 976b3fcc0e..0000000000 --- a/packages/initramfs/sysutils/open-iscsi/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2012 Yann Cézard (eesprit@free.fr) -# -# 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 - -OPEN_ISCSI_DIR="$BUILD/open-iscsi-$PKG_VERSION" - -mkdir -p $INSTALL/sbin - cp -P $OPEN_ISCSI_DIR/usr/iscsistart $INSTALL/sbin diff --git a/packages/initramfs/sysutils/open-iscsi/meta b/packages/sysutils/open-iscsi/package.mk similarity index 79% rename from packages/initramfs/sysutils/open-iscsi/meta rename to packages/sysutils/open-iscsi/package.mk index 4386ef059e..46285d89cf 100644 --- a/packages/initramfs/sysutils/open-iscsi/meta +++ b/packages/sysutils/open-iscsi/package.mk @@ -27,11 +27,30 @@ PKG_LICENSE="GPL" PKG_SITE="https://github.com/mikechristie/open-iscsi" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain util-linux" +PKG_BUILD_DEPENDS_INIT="toolchain util-linux" PKG_PRIORITY="optional" PKG_SECTION="initramfs/system" PKG_SHORTDESC="open-iscsi: system utilities for Linux to access iSCSI targets" PKG_LONGDESC="The open-iscsi package allows you to mount iSCSI targets. This package add support for using iscsi target as root device." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_MAKE_OPTS_INIT="user" + +pre_configure_init() { + export OPTFLAGS="$CFLAGS $LDFLAGS" +} + +configure_init() { + cd utils/open-isns + ./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --with-security=no + cd ../.. +} + +makeinstall_init() { + mkdir -p $INSTALL/sbin + cp -P $ROOT/$PKG_BUILD/usr/iscsistart $INSTALL/sbin +} diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-01_dynamic_linked_iscsistart.patch b/packages/sysutils/open-iscsi/patches/open-iscsi-01_dynamic_linked_iscsistart.patch similarity index 100% rename from packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-01_dynamic_linked_iscsistart.patch rename to packages/sysutils/open-iscsi/patches/open-iscsi-01_dynamic_linked_iscsistart.patch diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-02-cross_compile.patch b/packages/sysutils/open-iscsi/patches/open-iscsi-02-cross_compile.patch similarity index 100% rename from packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-02-cross_compile.patch rename to packages/sysutils/open-iscsi/patches/open-iscsi-02-cross_compile.patch diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch b/packages/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch similarity index 100% rename from packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch rename to packages/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-04-no_iscsiuio.patch b/packages/sysutils/open-iscsi/patches/open-iscsi-04-no_iscsiuio.patch similarity index 100% rename from packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-04-no_iscsiuio.patch rename to packages/sysutils/open-iscsi/patches/open-iscsi-04-no_iscsiuio.patch