From 60b7c7618949e6940d973cef25bcd7dfaa10eb4b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 21 Jul 2010 18:55:47 +0200
Subject: [PATCH] packages/sysutils: remove $PKG_DIR declaration (now in
 config/path), include config/options with package name

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/ConsoleKit/build          | 2 +-
 packages/sysutils/ConsoleKit/install        | 2 +-
 packages/sysutils/LVM2/build                | 2 +-
 packages/sysutils/LVM2/install              | 2 +-
 packages/sysutils/bash/build                | 2 +-
 packages/sysutils/bash/install              | 2 +-
 packages/sysutils/busybox-hosttools/build   | 4 +---
 packages/sysutils/busybox-initramfs/build   | 4 +---
 packages/sysutils/busybox-initramfs/install | 4 +---
 packages/sysutils/busybox/build             | 4 +---
 packages/sysutils/busybox/install           | 4 +---
 packages/sysutils/busybox/need_unpack       | 3 +--
 packages/sysutils/busybox/unpack            | 2 +-
 packages/sysutils/dbus-host/build           | 2 +-
 packages/sysutils/dbus/build                | 2 +-
 packages/sysutils/dbus/install              | 2 +-
 packages/sysutils/dmidecode/build           | 2 +-
 packages/sysutils/dmidecode/install         | 2 +-
 packages/sysutils/grep/build                | 2 +-
 packages/sysutils/grep/install              | 2 +-
 packages/sysutils/kbd/build                 | 2 +-
 packages/sysutils/kbd/install               | 2 +-
 packages/sysutils/lcdproc/build             | 2 +-
 packages/sysutils/lcdproc/install           | 4 +---
 packages/sysutils/libatasmart/build         | 2 +-
 packages/sysutils/libatasmart/install       | 2 +-
 packages/sysutils/libusb-compat/build       | 2 +-
 packages/sysutils/libusb-compat/install     | 2 +-
 packages/sysutils/libusb/build              | 2 +-
 packages/sysutils/libusb/install            | 2 +-
 packages/sysutils/lm_sensors/build          | 2 +-
 packages/sysutils/lm_sensors/install        | 4 +---
 packages/sysutils/module-init-tools/build   | 2 +-
 packages/sysutils/par2cmdline/build         | 2 +-
 packages/sysutils/par2cmdline/install       | 2 +-
 packages/sysutils/parted/build              | 2 +-
 packages/sysutils/parted/install            | 2 +-
 packages/sysutils/pciutils/build            | 4 +---
 packages/sysutils/pciutils/install          | 2 +-
 packages/sysutils/plymouth-lite/build       | 2 +-
 packages/sysutils/plymouth-lite/install     | 4 +---
 packages/sysutils/pm-utils/build            | 2 +-
 packages/sysutils/pm-utils/install          | 4 +---
 packages/sysutils/remote/install            | 4 +---
 packages/sysutils/remote/irserver/build     | 2 +-
 packages/sysutils/remote/irserver/install   | 4 +---
 packages/sysutils/remote/lirc/build         | 2 +-
 packages/sysutils/remote/lirc/install       | 4 +---
 packages/sysutils/sg3_utils/build           | 2 +-
 packages/sysutils/sg3_utils/install         | 2 +-
 packages/sysutils/udev/build                | 2 +-
 packages/sysutils/udev/install              | 4 +---
 packages/sysutils/udisks/build              | 2 +-
 packages/sysutils/udisks/install            | 2 +-
 packages/sysutils/upower/build              | 2 +-
 packages/sysutils/upower/install            | 2 +-
 packages/sysutils/usbutils/build            | 2 +-
 packages/sysutils/usbutils/install          | 2 +-
 packages/sysutils/util-linux-ng/build       | 2 +-
 packages/sysutils/util-linux-ng/install     | 2 +-
 60 files changed, 60 insertions(+), 89 deletions(-)

diff --git a/packages/sysutils/ConsoleKit/build b/packages/sysutils/ConsoleKit/build
index 7c2ac8698b..919ef06945 100755
--- 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
diff --git a/packages/sysutils/ConsoleKit/install b/packages/sysutils/ConsoleKit/install
index 8102aec26e..751f8217ef 100755
--- 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
diff --git a/packages/sysutils/LVM2/build b/packages/sysutils/LVM2/build
index bc1f72ed1c..42885fd48e 100755
--- a/packages/sysutils/LVM2/build
+++ b/packages/sysutils/LVM2/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/build toolchain
 
diff --git a/packages/sysutils/LVM2/install b/packages/sysutils/LVM2/install
index 7efbd2bd1c..447ce64cfd 100755
--- 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
diff --git a/packages/sysutils/bash/build b/packages/sysutils/bash/build
index ea240a44b0..5773f2957f 100755
--- a/packages/sysutils/bash/build
+++ b/packages/sysutils/bash/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/build toolchain
 
diff --git a/packages/sysutils/bash/install b/packages/sysutils/bash/install
index 715e5b88ef..3cc4100f2f 100755
--- 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
diff --git a/packages/sysutils/busybox-hosttools/build b/packages/sysutils/busybox-hosttools/build
index 1cb99a45d0..163778fec5 100755
--- 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
diff --git a/packages/sysutils/busybox-initramfs/build b/packages/sysutils/busybox-initramfs/build
index cc74e55f1a..892d005ae5 100755
--- 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
diff --git a/packages/sysutils/busybox-initramfs/install b/packages/sysutils/busybox-initramfs/install
index 6288033538..184e75756e 100755
--- 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
diff --git a/packages/sysutils/busybox/build b/packages/sysutils/busybox/build
index 1815d2b910..0568b3569e 100755
--- 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
diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install
index 2dee09cdab..380af979d3 100755
--- 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`"
 
diff --git a/packages/sysutils/busybox/need_unpack b/packages/sysutils/busybox/need_unpack
index 01353e4d61..08eb4d014b 100755
--- 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
 
diff --git a/packages/sysutils/busybox/unpack b/packages/sysutils/busybox/unpack
index 8b5e7863a2..15e0f94efc 100755
--- a/packages/sysutils/busybox/unpack
+++ b/packages/sysutils/busybox/unpack
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/build toolchain
 
diff --git a/packages/sysutils/dbus-host/build b/packages/sysutils/dbus-host/build
index 5b45e1decc..7d61139e3a 100755
--- 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
diff --git a/packages/sysutils/dbus/build b/packages/sysutils/dbus/build
index 907079ccb3..1917d95096 100755
--- 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
diff --git a/packages/sysutils/dbus/install b/packages/sysutils/dbus/install
index 1edf6c67dd..08539ddeb8 100755
--- 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
diff --git a/packages/sysutils/dmidecode/build b/packages/sysutils/dmidecode/build
index 07184b006a..9443f96ded 100755
--- a/packages/sysutils/dmidecode/build
+++ b/packages/sysutils/dmidecode/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/build toolchain
 
diff --git a/packages/sysutils/dmidecode/install b/packages/sysutils/dmidecode/install
index 18609d431d..1306cb6466 100755
--- 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
diff --git a/packages/sysutils/grep/build b/packages/sysutils/grep/build
index b57f6dcac3..a18b353899 100755
--- 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
diff --git a/packages/sysutils/grep/install b/packages/sysutils/grep/install
index 6c0d375fdc..218e9c6907 100755
--- a/packages/sysutils/grep/install
+++ b/packages/sysutils/grep/install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/install pcre
 
diff --git a/packages/sysutils/kbd/build b/packages/sysutils/kbd/build
index 1733fbe5bd..b03dbd53f4 100755
--- a/packages/sysutils/kbd/build
+++ b/packages/sysutils/kbd/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/build toolchain
 
diff --git a/packages/sysutils/kbd/install b/packages/sysutils/kbd/install
index 3fafaafbef..d1ffa8ec0a 100755
--- 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
diff --git a/packages/sysutils/lcdproc/build b/packages/sysutils/lcdproc/build
index f35d8c9c57..511dc040a6 100755
--- 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
diff --git a/packages/sysutils/lcdproc/install b/packages/sysutils/lcdproc/install
index d395d781a0..103b3bf124 100755
--- 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
 
diff --git a/packages/sysutils/libatasmart/build b/packages/sysutils/libatasmart/build
index b21aed13fe..9d0730d321 100755
--- 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
diff --git a/packages/sysutils/libatasmart/install b/packages/sysutils/libatasmart/install
index a6b87b2485..fc1656cd3d 100755
--- a/packages/sysutils/libatasmart/install
+++ b/packages/sysutils/libatasmart/install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/install udev
 
diff --git a/packages/sysutils/libusb-compat/build b/packages/sysutils/libusb-compat/build
index f96de66d39..3af0bf24e2 100755
--- 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
diff --git a/packages/sysutils/libusb-compat/install b/packages/sysutils/libusb-compat/install
index e290c19bbb..e69f6b06a7 100755
--- 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
 
diff --git a/packages/sysutils/libusb/build b/packages/sysutils/libusb/build
index bc8857ec01..f71ba02a83 100755
--- a/packages/sysutils/libusb/build
+++ b/packages/sysutils/libusb/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/build toolchain
 
diff --git a/packages/sysutils/libusb/install b/packages/sysutils/libusb/install
index ad8b651301..b9e0b497e9 100755
--- 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
diff --git a/packages/sysutils/lm_sensors/build b/packages/sysutils/lm_sensors/build
index 9eb5ed9489..cdb4885bda 100755
--- 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
 
diff --git a/packages/sysutils/lm_sensors/install b/packages/sysutils/lm_sensors/install
index 5a9e0a0a88..5c0e3b3523 100755
--- 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
diff --git a/packages/sysutils/module-init-tools/build b/packages/sysutils/module-init-tools/build
index fa2c9db325..6b5cd9570c 100755
--- 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
 
diff --git a/packages/sysutils/par2cmdline/build b/packages/sysutils/par2cmdline/build
index aab03ad6ba..c7a6a0997d 100755
--- a/packages/sysutils/par2cmdline/build
+++ b/packages/sysutils/par2cmdline/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/build toolchain
 
diff --git a/packages/sysutils/par2cmdline/install b/packages/sysutils/par2cmdline/install
index 440e1c013f..7edfc19b0a 100755
--- 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
diff --git a/packages/sysutils/parted/build b/packages/sysutils/parted/build
index 3b64b2062a..1725d56b85 100755
--- 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
diff --git a/packages/sysutils/parted/install b/packages/sysutils/parted/install
index b03e23bb3f..f61d4e3bdd 100755
--- 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
 
diff --git a/packages/sysutils/pciutils/build b/packages/sysutils/pciutils/build
index b10a2c8862..307c98f84d 100755
--- 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" \
diff --git a/packages/sysutils/pciutils/install b/packages/sysutils/pciutils/install
index e7957accb5..d50cfd6bfb 100755
--- 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
diff --git a/packages/sysutils/plymouth-lite/build b/packages/sysutils/plymouth-lite/build
index ae6ebf3488..16668aa344 100755
--- 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
diff --git a/packages/sysutils/plymouth-lite/install b/packages/sysutils/plymouth-lite/install
index 41f357f80a..608bca08e8 100755
--- 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
diff --git a/packages/sysutils/pm-utils/build b/packages/sysutils/pm-utils/build
index 1733fbe5bd..b03dbd53f4 100755
--- 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
 
diff --git a/packages/sysutils/pm-utils/install b/packages/sysutils/pm-utils/install
index 924fd588a6..8945223185 100755
--- 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
diff --git a/packages/sysutils/remote/install b/packages/sysutils/remote/install
index 5f8129d2c2..7900c3601e 100755
--- 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
\ No newline at end of file
diff --git a/packages/sysutils/remote/irserver/build b/packages/sysutils/remote/irserver/build
index 487d00a92c..bb2434d5fa 100755
--- 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
 
diff --git a/packages/sysutils/remote/irserver/install b/packages/sysutils/remote/irserver/install
index 4f33270239..d980816d3a 100755
--- 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
diff --git a/packages/sysutils/remote/lirc/build b/packages/sysutils/remote/lirc/build
index e95c8a4f44..048fe5c3ab 100755
--- 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
 
diff --git a/packages/sysutils/remote/lirc/install b/packages/sysutils/remote/lirc/install
index dacd01b7bb..7fea9b8c02 100755
--- 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
diff --git a/packages/sysutils/sg3_utils/build b/packages/sysutils/sg3_utils/build
index c50da5f01a..4b6fa620c3 100755
--- 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
 
diff --git a/packages/sysutils/sg3_utils/install b/packages/sysutils/sg3_utils/install
index 08ef28858d..8fb846d505 100755
--- 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
diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build
index cbda168eb6..42e8fc6cfa 100755
--- 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
diff --git a/packages/sysutils/udev/install b/packages/sysutils/udev/install
index c10d153357..219bb9bb6f 100755
--- 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
diff --git a/packages/sysutils/udisks/build b/packages/sysutils/udisks/build
index 5ca766bc91..a512566626 100755
--- 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
diff --git a/packages/sysutils/udisks/install b/packages/sysutils/udisks/install
index 151aa20e5c..66db80ca36 100755
--- 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
diff --git a/packages/sysutils/upower/build b/packages/sysutils/upower/build
index e3ed681c1d..d085b3a555 100755
--- 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
diff --git a/packages/sysutils/upower/install b/packages/sysutils/upower/install
index c9b9d39177..719ecd5924 100755
--- 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
diff --git a/packages/sysutils/usbutils/build b/packages/sysutils/usbutils/build
index 30ba731afa..2a8c47b27f 100755
--- 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
diff --git a/packages/sysutils/usbutils/install b/packages/sysutils/usbutils/install
index cd0f6ba4f9..08ccea9614 100755
--- 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
diff --git a/packages/sysutils/util-linux-ng/build b/packages/sysutils/util-linux-ng/build
index 9c5df611f4..b52175f579 100755
--- 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
 
diff --git a/packages/sysutils/util-linux-ng/install b/packages/sysutils/util-linux-ng/install
index 9af0d0b95e..f639758464 100755
--- 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