From ca292d5d141e9a1fe671315d173078feda47ec7c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 29 Jul 2013 07:47:35 +0200 Subject: [PATCH] dosfstools: convert to new package format Signed-off-by: Stephan Raue --- .../sysutils/dosfstools-initramfs/install | 3 +- packages/sysutils/dosfstools/build | 27 ----------------- packages/sysutils/dosfstools/install | 30 ------------------- .../sysutils/dosfstools/{meta => package.mk} | 8 +++-- 4 files changed, 7 insertions(+), 61 deletions(-) delete mode 100755 packages/sysutils/dosfstools/build delete mode 100755 packages/sysutils/dosfstools/install rename packages/sysutils/dosfstools/{meta => package.mk} (93%) diff --git a/packages/initramfs/sysutils/dosfstools-initramfs/install b/packages/initramfs/sysutils/dosfstools-initramfs/install index 49945afc4b..229737ae14 100755 --- a/packages/initramfs/sysutils/dosfstools-initramfs/install +++ b/packages/initramfs/sysutils/dosfstools-initramfs/install @@ -25,5 +25,4 @@ DOSFSTOOLS_DIR="$BUILD/dosfstools-*" mkdir -p $INSTALL/sbin - cp $DOSFSTOOLS_DIR/mkfs.fat $INSTALL/sbin - ln -sf mkfs.fat $INSTALL/sbin/fsck.vfat + cp -PR $DOSFSTOOLS_DIR/.install_pkg/usr/sbin/fsck.* $INSTALL/sbin diff --git a/packages/sysutils/dosfstools/build b/packages/sysutils/dosfstools/build deleted file mode 100755 index d71b2bbf26..0000000000 --- a/packages/sysutils/dosfstools/build +++ /dev/null @@ -1,27 +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 - -cd $PKG_BUILD - -make diff --git a/packages/sysutils/dosfstools/install b/packages/sysutils/dosfstools/install deleted file mode 100755 index eef2fbe816..0000000000 --- a/packages/sysutils/dosfstools/install +++ /dev/null @@ -1,30 +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 - -mkdir -p $INSTALL/usr/sbin - cp $PKG_BUILD/mkfs.fat $INSTALL/usr/sbin - ln -sf mkfs.fat $INSTALL/usr/sbin/mkfs.fat - cp $PKG_BUILD/fsck.fat $INSTALL/usr/sbin - ln -sf fsck.fat $INSTALL/usr/sbin/fsck.fat - cp $PKG_BUILD/fatlabel $INSTALL/usr/sbin diff --git a/packages/sysutils/dosfstools/meta b/packages/sysutils/dosfstools/package.mk similarity index 93% rename from packages/sysutils/dosfstools/meta rename to packages/sysutils/dosfstools/package.mk index 48771dfdd3..869fedf439 100644 --- a/packages/sysutils/dosfstools/meta +++ b/packages/sysutils/dosfstools/package.mk @@ -26,11 +26,15 @@ PKG_LICENSE="GPL" PKG_SITE="http://daniel-baumann.ch/software/dosfstools/" PKG_URL="http://daniel-baumann.ch/files/software/dosfstools/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" PKG_SECTION="tools" PKG_SHORTDESC="dosfstools: utilities for making and checking MS-DOS FAT filesystems." PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_MAKE_OPTS_TARGET="PREFIX=/usr" +PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr" +