From e4cde4775a51e70c11bcb39a2215438e49a2dc35 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 1 Aug 2013 16:20:16 +0200 Subject: [PATCH] util-linux: convert to new package format Signed-off-by: Stephan Raue --- .../diskdev_cmds/udev.d/62-fsck-hfsplus.rules | 2 +- packages/sysutils/util-linux/build | 101 --------------- packages/sysutils/util-linux/install | 48 ------- packages/sysutils/util-linux/meta | 35 ----- packages/sysutils/util-linux/package.mk | 122 ++++++++++++++++++ 5 files changed, 123 insertions(+), 185 deletions(-) delete mode 100755 packages/sysutils/util-linux/build delete mode 100755 packages/sysutils/util-linux/install delete mode 100644 packages/sysutils/util-linux/meta create mode 100644 packages/sysutils/util-linux/package.mk diff --git a/packages/sysutils/diskdev_cmds/udev.d/62-fsck-hfsplus.rules b/packages/sysutils/diskdev_cmds/udev.d/62-fsck-hfsplus.rules index e6bd5147d1..3aa2170d88 100644 --- a/packages/sysutils/diskdev_cmds/udev.d/62-fsck-hfsplus.rules +++ b/packages/sysutils/diskdev_cmds/udev.d/62-fsck-hfsplus.rules @@ -21,7 +21,7 @@ SUBSYSTEM!="block", GOTO="end" ACTION!="add", GOTO="end" -ACTION=="add", IMPORT{program}="/usr/bin/blkid -o udev -p %N" +ACTION=="add", IMPORT{program}="/usr/sbin/blkid -o udev -p %N" ACTION=="add", ENV{ID_FS_TYPE}=="hfsplus", ENV{mount_options}="rw,nosuid,nodev,uhelper=udisks", RUN+="/bin/fsck.hfsplus -r -y /dev/%k" # exit diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build deleted file mode 100755 index 526e5b44b5..0000000000 --- a/packages/sysutils/util-linux/build +++ /dev/null @@ -1,101 +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 -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --disable-silent-rules \ - --enable-shared \ - --disable-static \ - --disable-gtk-doc \ - --disable-nls \ - --disable-rpath \ - --enable-tls \ - --enable-libuuid \ - --enable-libblkid \ - --enable-libmount \ - --disable-deprecated-mount \ - --disable-mount \ - --enable-fsck \ - --disable-partx \ - --enable-uuidd \ - --disable-mountpoint \ - --disable-fallocate \ - --disable-unshare \ - --disable-arch \ - --disable-ddate \ - --disable-eject \ - --disable-agetty \ - --disable-cramfs \ - --disable-switch-root \ - --disable-pivot-root \ - --disable-elvtune \ - --disable-kill \ - --disable-last \ - --disable-utmpdump \ - --disable-line \ - --disable-mesg \ - --disable-raw \ - --disable-rename \ - --disable-reset \ - --disable-vipw \ - --disable-newgrp \ - --disable-chfn-chsh \ - --enable-chsh-only-listed \ - --disable-login \ - --disable-login-chown-vcs \ - --disable-login-stat-mail \ - --disable-sulogin \ - --disable-su \ - --disable-runuser \ - --disable-ul \ - --disable-more \ - --disable-pg \ - --disable-setterm \ - --disable-schedutils \ - --disable-wall \ - --disable-write \ - --disable-chkdupexe \ - --disable-socket-activation \ - --disable-pg-bell \ - --disable-require-password \ - --disable-use-tty-group \ - --disable-makeinstall-chown \ - --disable-makeinstall-setuid \ - --with-gnu-ld \ - --without-selinux \ - --without-audit \ - --without-udev \ - --without-ncurses \ - --without-slang \ - --without-utempter \ - --without-systemdsystemunitdir - -make - -$MAKEINSTALL - diff --git a/packages/sysutils/util-linux/install b/packages/sysutils/util-linux/install deleted file mode 100755 index 7167fa7607..0000000000 --- a/packages/sysutils/util-linux/install +++ /dev/null @@ -1,48 +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/bin - cp $PKG_BUILD/fstrim $INSTALL/usr/bin - cp $PKG_BUILD/.libs/blkid $INSTALL/usr/bin - cp $PKG_BUILD/.libs/fsck $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/lib - cp -PR $PKG_BUILD/.libs/libblkid.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libblkid.so*T - cp -PR $PKG_BUILD/.libs/libmount.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libmount.so*T - cp -PR $PKG_BUILD/.libs/libuuid.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libuuid.so*T - -if [ "$SWAP_SUPPORT" = "yes" ]; then - mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/.libs/swapon $INSTALL/usr/bin - cp $PKG_BUILD/.libs/swapoff $INSTALL/usr/bin - - mkdir -p $INSTALL/etc/init.d - cp $PKG_DIR/scripts/32_swapfile $INSTALL/etc/init.d - - mkdir -p $INSTALL/etc - cat $PKG_DIR/config/swap.conf | sed -e "s,@SWAPFILESIZE@,$SWAPFILESIZE,g" > $INSTALL/etc/swap.conf -fi diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta deleted file mode 100644 index f136dc5085..0000000000 --- a/packages/sysutils/util-linux/meta +++ /dev/null @@ -1,35 +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="util-linux" -PKG_VERSION="2.23.2" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.23/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="util-linux: Miscellaneous system utilities for Linux" -PKG_LONGDESC="The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among many features, Util-linux contains the fdisk configuration tool and the login program." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk new file mode 100644 index 0000000000..dc2c2cce47 --- /dev/null +++ b/packages/sysutils/util-linux/package.mk @@ -0,0 +1,122 @@ +################################################################################ +# 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="util-linux" +PKG_VERSION="2.23.2" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.23/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS_TARGET="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="system" +PKG_SHORTDESC="util-linux: Miscellaneous system utilities for Linux" +PKG_LONGDESC="The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among many features, Util-linux contains the fdisk configuration tool and the login program." + +PKG_IS_ADDON="no" +PKG_AUTORECONF="yes" + +PKG_CONFIGURE_OPTS_TARGET="--disable-gtk-doc \ + --disable-nls \ + --disable-rpath \ + --enable-tls \ + --enable-libuuid \ + --enable-libblkid \ + --enable-libmount \ + --disable-deprecated-mount \ + --disable-mount \ + --enable-fsck \ + --disable-partx \ + --enable-uuidd \ + --disable-mountpoint \ + --disable-fallocate \ + --disable-unshare \ + --disable-arch \ + --disable-ddate \ + --disable-eject \ + --disable-agetty \ + --disable-cramfs \ + --disable-switch-root \ + --disable-pivot-root \ + --disable-elvtune \ + --disable-kill \ + --disable-last \ + --disable-utmpdump \ + --disable-line \ + --disable-mesg \ + --disable-raw \ + --disable-rename \ + --disable-reset \ + --disable-vipw \ + --disable-newgrp \ + --disable-chfn-chsh \ + --enable-chsh-only-listed \ + --disable-login \ + --disable-login-chown-vcs \ + --disable-login-stat-mail \ + --disable-sulogin \ + --disable-su \ + --disable-runuser \ + --disable-ul \ + --disable-more \ + --disable-pg \ + --disable-setterm \ + --disable-schedutils \ + --disable-wall \ + --disable-write \ + --disable-chkdupexe \ + --disable-socket-activation \ + --disable-pg-bell \ + --disable-require-password \ + --disable-use-tty-group \ + --disable-makeinstall-chown \ + --disable-makeinstall-setuid \ + --with-gnu-ld \ + --without-selinux \ + --without-audit \ + --without-udev \ + --without-ncurses \ + --without-slang \ + --without-utempter \ + --without-systemdsystemunitdir" + +post_makeinstall_target() { + rm -rf $INSTALL/usr/bin + rm -rf $INSTALL/usr/sbin + rm -rf $INSTALL/usr/share + + mkdir -p $INSTALL/usr/sbin + cp fstrim $INSTALL/usr/sbin + cp .libs/blkid $INSTALL/usr/sbin + cp .libs/fsck $INSTALL/usr/sbin + + if [ "$SWAP_SUPPORT" = "yes" ]; then + mkdir -p $INSTALL/usr/sbin + cp .libs/swapon $INSTALL/usr/sbin + cp .libs/swapoff $INSTALL/usr/sbin + + mkdir -p $INSTALL/etc/init.d + cp $PKG_DIR/scripts/32_swapfile $INSTALL/etc/init.d + + mkdir -p $INSTALL/etc + cat $PKG_DIR/config/swap.conf | sed -e "s,@SWAPFILESIZE@,$SWAPFILESIZE,g" > $INSTALL/etc/swap.conf + fi +}