packages/sysutils: remove $PKG_DIR declaration (now in config/path), include config/options with package name

Signed-off-by: Stephan Raue <stephan@openelec.tv>
2025-07-24 11:16:51 +00:00 · 2010-07-21 18:55:47 +02:00 · 2010-07-21 18:55:47 +02:00 · 60b7c76189
commit 60b7c76189
parent c7cf1f753b
60 changed files with 60 additions and 89 deletions
--- a/packages/sysutils/ConsoleKit/build
+++ b/packages/sysutils/ConsoleKit/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build dbus
--- a/packages/sysutils/ConsoleKit/install
+++ b/packages/sysutils/ConsoleKit/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install dbus
 $SCRIPTS/install dbus-glib
--- a/packages/sysutils/LVM2/build
+++ b/packages/sysutils/LVM2/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/LVM2/install
+++ b/packages/sysutils/LVM2/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/etc/lvm
  cp $BUILD/$1*/doc/example.conf $INSTALL/etc/lvm/lvm.conf
--- a/packages/sysutils/bash/build
+++ b/packages/sysutils/bash/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/bash/install
+++ b/packages/sysutils/bash/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/bin
  cp $PKG_BUILD/bash $INSTALL/bin
--- a/packages/sysutils/busybox-hosttools/build
+++ b/packages/sysutils/busybox-hosttools/build
@ -1,14 +1,12 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/unpack busybox

 setup_toolchain host

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 cd $BUILD/busybox*
  make distclean
  cp $ROOT/$PKG_DIR/config/$1.conf .config
--- a/packages/sysutils/busybox-initramfs/build
+++ b/packages/sysutils/busybox-initramfs/build
@ -1,12 +1,10 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/unpack busybox

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 if [ -f $PROJECT_DIR/$PROJECT/busybox/$1.conf ]; then
  BUSYBOX_CFG_FILE=$PROJECT_DIR/$PROJECT/busybox/$1.conf
 else
--- a/packages/sysutils/busybox-initramfs/install
+++ b/packages/sysutils/busybox-initramfs/install
@ -1,11 +1,9 @@
 #!/bin/sh

-. config/options
+. config/options $1
 $SCRIPTS/unpack linux
 $SCRIPTS/install plymouth-lite initramfs

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
  mkdir -p $INSTALL/initramfs
  cp -PR $BUILD/busybox*/_install-initramfs/* $INSTALL/initramfs
  chmod 4755 $INSTALL/initramfs/bin/busybox
--- a/packages/sysutils/busybox/build
+++ b/packages/sysutils/busybox/build
@ -1,13 +1,11 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/unpack busybox
 $SCRIPTS/build Linux-PAM

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 if [ -f $PROJECT_DIR/$PROJECT/busybox/$1.conf ]; then
  BUSYBOX_CFG_FILE=$PROJECT_DIR/$PROJECT/busybox/$1.conf
 else
--- a/packages/sysutils/busybox/install
+++ b/packages/sysutils/busybox/install
@ -1,12 +1,10 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build busybox-hosttools
 $SCRIPTS/install Linux-PAM

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $ROOT_PASSWORD`"
 USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"

--- a/packages/sysutils/busybox/need_unpack
+++ b/packages/sysutils/busybox/need_unpack
@ -1,9 +1,8 @@
 #!/bin/sh

-. config/options
+. config/options $1

 STAMP=$STAMPS/$1/unpack
-PKG_DIR=`find $PACKAGES -type d -name $1`

 . $STAMP

--- a/packages/sysutils/busybox/unpack
+++ b/packages/sysutils/busybox/unpack
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/dbus-host/build
+++ b/packages/sysutils/dbus-host/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build expat-host
--- a/packages/sysutils/dbus/build
+++ b/packages/sysutils/dbus/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build expat
--- a/packages/sysutils/dbus/install
+++ b/packages/sysutils/dbus/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install expat
 $SCRIPTS/install libX11
--- a/packages/sysutils/dmidecode/build
+++ b/packages/sysutils/dmidecode/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/dmidecode/install
+++ b/packages/sysutils/dmidecode/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/usr/sbin
  cp -P $PKG_BUILD/dmidecode $INSTALL/usr/sbin
--- a/packages/sysutils/grep/build
+++ b/packages/sysutils/grep/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build pcre
--- a/packages/sysutils/grep/install
+++ b/packages/sysutils/grep/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install pcre

--- a/packages/sysutils/kbd/build
+++ b/packages/sysutils/kbd/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/kbd/install
+++ b/packages/sysutils/kbd/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/usr/bin
  cp $PKG_BUILD/src/chvt $INSTALL/usr/bin
--- a/packages/sysutils/lcdproc/build
+++ b/packages/sysutils/lcdproc/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build libusb
--- a/packages/sysutils/lcdproc/install
+++ b/packages/sysutils/lcdproc/install
@ -1,12 +1,10 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install libusb
 $SCRIPTS/install irserver

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 add_user nobody x 999 999 "Nobody" "/" "/bin/sh"
 add_group nobody 999

--- a/packages/sysutils/libatasmart/build
+++ b/packages/sysutils/libatasmart/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build udev
--- a/packages/sysutils/libatasmart/install
+++ b/packages/sysutils/libatasmart/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install udev

--- a/packages/sysutils/libusb-compat/build
+++ b/packages/sysutils/libusb-compat/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build libusb
--- a/packages/sysutils/libusb-compat/install
+++ b/packages/sysutils/libusb-compat/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install libusb

--- a/packages/sysutils/libusb/build
+++ b/packages/sysutils/libusb/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/libusb/install
+++ b/packages/sysutils/libusb/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/usr/lib
  cp -PR $PKG_BUILD/$1/.libs/libusb*.so* $INSTALL/usr/lib
--- a/packages/sysutils/lm_sensors/build
+++ b/packages/sysutils/lm_sensors/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/lm_sensors/install
+++ b/packages/sysutils/lm_sensors/install
@ -1,8 +1,6 @@
 #!/bin/sh

-. config/options
-
-PKG_DIR=`find $PACKAGES -type d -name $1`
+. config/options $1

 mkdir -p $INSTALL/usr/bin
  cp $PKG_BUILD/prog/sensors/sensors $INSTALL/usr/bin
--- a/packages/sysutils/module-init-tools/build
+++ b/packages/sysutils/module-init-tools/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/par2cmdline/build
+++ b/packages/sysutils/par2cmdline/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/par2cmdline/install
+++ b/packages/sysutils/par2cmdline/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/usr/bin
  cp -PR $PKG_BUILD/par2 $INSTALL/usr/bin
--- a/packages/sysutils/parted/build
+++ b/packages/sysutils/parted/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build util-linux-ng
--- a/packages/sysutils/parted/install
+++ b/packages/sysutils/parted/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install util-linux-ng

--- a/packages/sysutils/pciutils/build
+++ b/packages/sysutils/pciutils/build
@ -1,11 +1,9 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 cd $PKG_BUILD

 make OPT="$TARGET_CFLAGS" \
--- a/packages/sysutils/pciutils/install
+++ b/packages/sysutils/pciutils/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/usr/bin
  cp $PKG_BUILD/lspci $INSTALL/usr/bin
--- a/packages/sysutils/plymouth-lite/build
+++ b/packages/sysutils/plymouth-lite/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build libpng
--- a/packages/sysutils/plymouth-lite/install
+++ b/packages/sysutils/plymouth-lite/install
@ -1,8 +1,6 @@
 #!/bin/sh

-. config/options
-
-PKG_DIR=`find $PACKAGES -type d -name $1`
+. config/options $1

 if [ "$2" = initramfs ]; then
  mkdir -p $INSTALL/initramfs/bin
--- a/packages/sysutils/pm-utils/build
+++ b/packages/sysutils/pm-utils/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/pm-utils/install
+++ b/packages/sysutils/pm-utils/install
@ -1,13 +1,11 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install grep
 $SCRIPTS/install dmidecode
 $SCRIPTS/install kbd

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 mkdir -p $INSTALL/etc/pm/config.d
 mkdir -p $INSTALL/etc/pm/power.d
 mkdir -p $INSTALL/etc/pm/sleep.d
--- a/packages/sysutils/remote/install
+++ b/packages/sysutils/remote/install
@ -1,11 +1,9 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install lirc
 $SCRIPTS/install irserver

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 mkdir -p $INSTALL/usr/config
  cp $PKG_DIR/config/*.conf $INSTALL/usr/config
--- a/packages/sysutils/remote/irserver/build
+++ b/packages/sysutils/remote/irserver/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/remote/irserver/install
+++ b/packages/sysutils/remote/irserver/install
@ -1,8 +1,6 @@
 #!/bin/sh

-. config/options
-
-PKG_DIR=`find $PACKAGES -type d -name $1`
+. config/options $1

 mkdir -p $INSTALL/usr/sbin
  [ $TARGET_ARCH = i386 ] && cp -P $PKG_BUILD/irserver $INSTALL/usr/sbin/irserver
--- a/packages/sysutils/remote/lirc/build
+++ b/packages/sysutils/remote/lirc/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/remote/lirc/install
+++ b/packages/sysutils/remote/lirc/install
@ -1,8 +1,6 @@
 #!/bin/sh

-. config/options
-
-PKG_DIR=`find $PACKAGES -type d -name $1`
+. config/options $1

 mkdir -p $INSTALL/usr/sbin
  cp $PKG_BUILD/daemons/lircd $INSTALL/usr/sbin
--- a/packages/sysutils/sg3_utils/build
+++ b/packages/sysutils/sg3_utils/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/sg3_utils/install
+++ b/packages/sysutils/sg3_utils/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/usr/lib
  cp -PR $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
--- a/packages/sysutils/udev/build
+++ b/packages/sysutils/udev/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build glib
--- a/packages/sysutils/udev/install
+++ b/packages/sysutils/udev/install
@ -1,14 +1,12 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install glib
 $SCRIPTS/install pciutils
 $SCRIPTS/install usbutils
 $SCRIPTS/install libusb-compat

-PKG_DIR=`find $PACKAGES -type d -name $1`
-
  add_group cdrom 11
  add_group dialout 18
  add_group disk 6
--- a/packages/sysutils/udisks/build
+++ b/packages/sysutils/udisks/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build sg3_utils
--- a/packages/sysutils/udisks/install
+++ b/packages/sysutils/udisks/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install sg3_utils
 $SCRIPTS/install udev
--- a/packages/sysutils/upower/build
+++ b/packages/sysutils/upower/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build udev
--- a/packages/sysutils/upower/install
+++ b/packages/sysutils/upower/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install udev
 $SCRIPTS/install glib
--- a/packages/sysutils/usbutils/build
+++ b/packages/sysutils/usbutils/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain
 $SCRIPTS/build zlib
--- a/packages/sysutils/usbutils/install
+++ b/packages/sysutils/usbutils/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/install zlib
 $SCRIPTS/install libusb-compat
--- a/packages/sysutils/util-linux-ng/build
+++ b/packages/sysutils/util-linux-ng/build
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 $SCRIPTS/build toolchain

--- a/packages/sysutils/util-linux-ng/install
+++ b/packages/sysutils/util-linux-ng/install
@ -1,6 +1,6 @@
 #!/bin/sh

-. config/options
+. config/options $1

 mkdir -p $INSTALL/bin
  cp $PKG_BUILD/mount/.libs/mount $INSTALL/bin