From 2b0084787681422387f1d4fcf3f2729052572a00 Mon Sep 17 00:00:00 2001 From: acinonyx Date: Sat, 17 Apr 2010 19:20:14 +0000 Subject: [PATCH] [packages] {pciutils,usbutils}: Fix updating of IDs when installing on destination other than root (#7077) git-svn-id: svn://svn.openwrt.org/openwrt/packages@20962 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- utils/pciutils/Makefile | 4 ++-- utils/usbutils/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile index e89faccb7..cac5fb6d5 100644 --- a/utils/pciutils/Makefile +++ b/utils/pciutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pciutils PKG_VERSION:=3.1.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils @@ -34,7 +34,7 @@ endef define Package/pciutils/postinst #!/bin/sh -(cd $${IPKG_INSTROOT}/usr/share; $${IPKG_INSTROOT}/usr/sbin/update-pciids) +(cd $${PKG_ROOT}/usr/share; $${PKG_ROOT}/usr/sbin/update-pciids) exit 0 endef diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile index f15e63c2f..15d2d5b5e 100644 --- a/utils/usbutils/Makefile +++ b/utils/usbutils/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2009 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbutils PKG_VERSION:=0.86 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linux-usb @@ -29,7 +29,7 @@ endef define Package/usbutils/postinst #!/bin/sh -(cd $${IPKG_INSTROOT}/usr/share; $${IPKG_INSTROOT}/usr/sbin/update-usbids.sh) +(cd $${IPKG_INSTROOT}/usr/share; $${PKG_ROOT}/usr/sbin/update-usbids.sh) exit 0 endef