[oe-commits] org.oe.dev merge of 'eaf98be5dcfba80d61fd7d46052a466eef0710b7'

xora commit openembedded-commits at lists.openembedded.org
Sun Oct 7 18:56:06 UTC 2007


merge of 'eaf98be5dcfba80d61fd7d46052a466eef0710b7'
     and 'efc59ba2f852cc347511e969a7a443ed2854c362'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9
ViewMTN: http://monotone.openembedded.org/revision/info/80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9
Files:
1
packages/mplayer/files/pxa_configure.patch
packages/mplayer/mplayer_svn.bb
packages/glib-2.0/glib-2.0-2.14.1
packages/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch
packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch
packages/glib-2.0/glib-2.0-2.14.1/gcc-4.2-inline-fix.patch
packages/glib-2.0/glib-2.0_2.14.1.bb
packages/lm_sensors/files/prefix-fix.patch
conf/machine/alix.conf
conf/machine/epia.conf
conf/machine/guinness.conf
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
conf/machine/netvista.conf
conf/machine/progear.conf
conf/machine/qemux86.conf
conf/machine/wrap.conf
conf/machine/x86-32-nocona.conf
conf/machine/x86-prescott.conf
conf/machine/x86.conf
packages/glib-2.0/glib-2.0_2.14.0.bb
packages/lm_sensors/lmsensors-apps_2.10.1.bb
Diffs:

#
# mt diff -reaf98be5dcfba80d61fd7d46052a466eef0710b7 -r80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9
#
# 
# 
# patch "packages/mplayer/files/pxa_configure.patch"
#  from [93eea0c82165dba1555a9f1922bd276ba0da80d2]
#    to [8b3a65628f4f31876b7d2651580ceb83e9ef0cef]
# 
# patch "packages/mplayer/mplayer_svn.bb"
#  from [ef35057ee8e9aef0122d490fe9154954c594eb75]
#    to [74b353062db373f41fc56a8d073b1c5c19fdf347]
# 
============================================================
--- packages/mplayer/files/pxa_configure.patch	93eea0c82165dba1555a9f1922bd276ba0da80d2
+++ packages/mplayer/files/pxa_configure.patch	8b3a65628f4f31876b7d2651580ceb83e9ef0cef
@@ -25,11 +25,11 @@ Index: MPlayer-1.0rc1/configure
  
 +echocheck "PXA27x Overlay Support"
 +if test "$_pxa" = yes ; then
-+  _def_imageon='#define HAVE_PXA 1'
++  _def_pxa='#define HAVE_PXA 1'
 +  _vosrc="$_vosrc vo_pxa.c"
 +  _vomodules="pxa $_vomodules"
 +else
-+  _def_imageon='#undef HAVE_IMAGEON'
++  _def_pxa='#undef HAVE_IMAGEON'
 +  _novomodules="pxa $_novomodules"
 +fi
 +echores "$_pxa"
============================================================
--- packages/mplayer/mplayer_svn.bb	ef35057ee8e9aef0122d490fe9154954c594eb75
+++ packages/mplayer/mplayer_svn.bb	74b353062db373f41fc56a8d073b1c5c19fdf347
@@ -40,7 +40,7 @@ PV = "0.0+1.0rc1+svnr${SRCREV}"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc1+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 DEFAULT_PREFERENCE = "-1"
 
 PARALLEL_MAKE = ""


#
# mt diff -refc59ba2f852cc347511e969a7a443ed2854c362 -r80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9
#
# 
# 
# add_dir "packages/glib-2.0/glib-2.0-2.14.1"
# 
# add_file "packages/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch"
#  content [47cc412da2be5f8158f7dc558cdb2ed4f62a22da]
# 
# add_file "packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch"
#  content [2e9bdca6abde5498601df5b513b4ed387f00d49e]
# 
# add_file "packages/glib-2.0/glib-2.0-2.14.1/gcc-4.2-inline-fix.patch"
#  content [47cc412da2be5f8158f7dc558cdb2ed4f62a22da]
# 
# add_file "packages/glib-2.0/glib-2.0_2.14.1.bb"
#  content [256b1c8d9f5d5b075470c1ead8e706218240944e]
# 
# add_file "packages/lm_sensors/files/prefix-fix.patch"
#  content [209edbf073290d444b47cb953c7d60b1bc870baa]
# 
# patch "conf/machine/alix.conf"
#  from [f8fdaa68a61adeffcb530a174e2e182280770dd5]
#    to [53d221f82557e515e40af9234547d38664a2dff9]
# 
# patch "conf/machine/epia.conf"
#  from [447a89306f42410510b6676e2e317f2a893709b4]
#    to [7ea29c9254e8cf7eb3efe9042c2597a57123e9d9]
# 
# patch "conf/machine/guinness.conf"
#  from [73fc910a04f64a44077423b2ae1d4a124f4ebfdc]
#    to [9cae2f8707149cf3e6b6e33cebaa348560898962]
# 
# patch "conf/machine/i586-generic.conf"
#  from [006a74a863afd1f923bb67cedef39bf4391cffd0]
#    to [d53211500c299b141a5911dd6cb8b095d46bf74a]
# 
# patch "conf/machine/i686-generic.conf"
#  from [ee687be060f3975c6581a344e0fcff555311c4c0]
#    to [fe0d7dacb28a7233e9aec258ab69a439e0f89d7f]
# 
# patch "conf/machine/netvista.conf"
#  from [5fa034197f2e35cab1099297e0461c05d84a1401]
#    to [4a37e5d3eb7a0ac06c088d3f1d6f68e27044f66b]
# 
# patch "conf/machine/progear.conf"
#  from [22e49b5432e36f46f19bdb061e0226cda4016d6c]
#    to [6ddc658f0cc1cf705f4430b92e3c7d534cf644bd]
# 
# patch "conf/machine/qemux86.conf"
#  from [2aa871c692f0a5205e3b06714b12e27b7bc978c1]
#    to [74fdc152193ec1934216879ff766e8e13e098985]
# 
# patch "conf/machine/wrap.conf"
#  from [7364205fdb720403971f54dc88bc58479794a3a2]
#    to [e9bcd3174ca6a26e8d157ac7df123c6bedd4e36d]
# 
# patch "conf/machine/x86-32-nocona.conf"
#  from [23cb58df20b02ae0c028f4341041e6800d10f347]
#    to [4751fe71ac3de06ec5669fd29663ce396bf3ac4f]
# 
# patch "conf/machine/x86-prescott.conf"
#  from [aaa114f1f2f973a0736d7df2a7ecef7794a59966]
#    to [c4bf154f03bb4818ad538b852d24e1d50e653d76]
# 
# patch "conf/machine/x86.conf"
#  from [e40a530eadbc02e9ed6fd2d267d4a492bc1d403a]
#    to [28f63bda2b037a316931c0707a0db0f81b10a9cb]
# 
# patch "packages/glib-2.0/glib-2.0_2.14.0.bb"
#  from [21999f530ce7682e78fd14b67e5d29e2bf2c322f]
#    to [256b1c8d9f5d5b075470c1ead8e706218240944e]
# 
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
#  from [cfb415f977c0f9b8a4e012bd39fe5df35f0e6b2b]
#    to [098458d7451b302e662d248e4b54f392a787c643]
# 
============================================================
--- packages/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch	47cc412da2be5f8158f7dc558cdb2ed4f62a22da
+++ packages/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch	47cc412da2be5f8158f7dc558cdb2ed4f62a22da
@@ -0,0 +1,17 @@
+Index: glib-2.12.9/glib/gutils.h
+===================================================================
+--- glib-2.12.9.orig/glib/gutils.h	2007-10-07 19:13:53.000000000 +0200
++++ glib-2.12.9/glib/gutils.h	2007-10-07 19:15:04.000000000 +0200
+@@ -97,7 +97,11 @@
+ #  define G_INLINE_FUNC
+ #  undef  G_CAN_INLINE
+ #elif defined (__GNUC__) 
+-#  define G_INLINE_FUNC extern inline
++#  if defined (__GNUC_GNU_INLINE__)
++#    define G_INLINE_FUNC extern  __attribute__((gnu_inline)) inline
++#  else
++#    define G_INLINE_FUNC extern inline
++#  endif
+ #elif defined (G_CAN_INLINE) 
+ #  define G_INLINE_FUNC static inline
+ #else /* can't inline */
============================================================
--- packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch	2e9bdca6abde5498601df5b513b4ed387f00d49e
+++ packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch	2e9bdca6abde5498601df5b513b4ed387f00d49e
@@ -0,0 +1,29 @@
+--- glib-2.12.10/configure.in.orig	2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in	2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+ 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ 	echo "void glib_plugin_test(void) { }" > plugin.c
+-	${SHELL} ./libtool --mode=compile ${CC} -shared \
++	${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ 		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ 		glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+ 
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
============================================================
--- packages/glib-2.0/glib-2.0-2.14.1/gcc-4.2-inline-fix.patch	47cc412da2be5f8158f7dc558cdb2ed4f62a22da
+++ packages/glib-2.0/glib-2.0-2.14.1/gcc-4.2-inline-fix.patch	47cc412da2be5f8158f7dc558cdb2ed4f62a22da
@@ -0,0 +1,17 @@
+Index: glib-2.12.9/glib/gutils.h
+===================================================================
+--- glib-2.12.9.orig/glib/gutils.h	2007-10-07 19:13:53.000000000 +0200
++++ glib-2.12.9/glib/gutils.h	2007-10-07 19:15:04.000000000 +0200
+@@ -97,7 +97,11 @@
+ #  define G_INLINE_FUNC
+ #  undef  G_CAN_INLINE
+ #elif defined (__GNUC__) 
+-#  define G_INLINE_FUNC extern inline
++#  if defined (__GNUC_GNU_INLINE__)
++#    define G_INLINE_FUNC extern  __attribute__((gnu_inline)) inline
++#  else
++#    define G_INLINE_FUNC extern inline
++#  endif
+ #elif defined (G_CAN_INLINE) 
+ #  define G_INLINE_FUNC static inline
+ #else /* can't inline */
============================================================
--- packages/glib-2.0/glib-2.0_2.14.1.bb	256b1c8d9f5d5b075470c1ead8e706218240944e
+++ packages/glib-2.0/glib-2.0_2.14.1.bb	256b1c8d9f5d5b075470c1ead8e706218240944e
@@ -0,0 +1,6 @@
+require glib.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1 \
+           file://gcc-4.2-inline-fix.patch;patch=1"
============================================================
--- packages/lm_sensors/files/prefix-fix.patch	209edbf073290d444b47cb953c7d60b1bc870baa
+++ packages/lm_sensors/files/prefix-fix.patch	209edbf073290d444b47cb953c7d60b1bc870baa
@@ -0,0 +1,14 @@
+Index: lm_sensors-2.10.1/Makefile
+===================================================================
+--- lm_sensors-2.10.1.orig/Makefile	2007-10-07 19:22:51.000000000 +0200
++++ lm_sensors-2.10.1/Makefile	2007-10-07 19:23:13.000000000 +0200
+@@ -74,9 +74,6 @@
+ # everything, set DESTDIR to the extra prefix.
+ DESTDIR :=
+ 
+-# This is the prefix that will be used for almost all directories below.
+-PREFIX := /usr/local
+-
+ # Your C compiler
+ CC := gcc
+ 
============================================================
--- conf/machine/alix.conf	f8fdaa68a61adeffcb530a174e2e182280770dd5
+++ conf/machine/alix.conf	53d221f82557e515e40af9234547d38664a2dff9
@@ -15,7 +15,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
 
 require conf/machine/include/tune-geodelx.conf
 
============================================================
--- conf/machine/epia.conf	447a89306f42410510b6676e2e317f2a893709b4
+++ conf/machine/epia.conf	7ea29c9254e8cf7eb3efe9042c2597a57123e9d9
@@ -12,7 +12,7 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_TASK_PROVIDER = "task-base"
 
 require conf/machine/include/tune-c3.inc
============================================================
--- conf/machine/guinness.conf	73fc910a04f64a44077423b2ae1d4a124f4ebfdc
+++ conf/machine/guinness.conf	9cae2f8707149cf3e6b6e33cebaa348560898962
@@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen x86"
 
 #require conf/machine/include/tune-athlonmp.inc
 
============================================================
--- conf/machine/i586-generic.conf	006a74a863afd1f923bb67cedef39bf4391cffd0
+++ conf/machine/i586-generic.conf	d53211500c299b141a5911dd6cb8b095d46bf74a
@@ -19,7 +19,7 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
============================================================
--- conf/machine/i686-generic.conf	ee687be060f3975c6581a344e0fcff555311c4c0
+++ conf/machine/i686-generic.conf	fe0d7dacb28a7233e9aec258ab69a439e0f89d7f
@@ -18,7 +18,7 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
============================================================
--- conf/machine/netvista.conf	5fa034197f2e35cab1099297e0461c05d84a1401
+++ conf/machine/netvista.conf	4a37e5d3eb7a0ac06c088d3f1d6f68e27044f66b
@@ -15,7 +15,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa x86"
 ROOT_FLASH_SIZE = "64"
 GUI_MACHINE_CLASS = "bigscreen"
 
============================================================
--- conf/machine/progear.conf	22e49b5432e36f46f19bdb061e0226cda4016d6c
+++ conf/machine/progear.conf	6ddc658f0cc1cf705f4430b92e3c7d534cf644bd
@@ -15,7 +15,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen x86"
 
 IMAGE_FSTYPES = "tar.gz"
 
============================================================
--- conf/machine/qemux86.conf	2aa871c692f0a5205e3b06714b12e27b7bc978c1
+++ conf/machine/qemux86.conf	74fdc152193ec1934216879ff766e8e13e098985
@@ -7,6 +7,8 @@ require conf/machine/include/qemu.inc
 
 require conf/machine/include/qemu.inc
 
+MACHINE_FEATURES += "x86"
+
 KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/wrap.conf	7364205fdb720403971f54dc88bc58479794a3a2
+++ conf/machine/wrap.conf	e9bcd3174ca6a26e8d157ac7df123c6bedd4e36d
@@ -22,7 +22,7 @@ IMAGE_FSTYPE ?= "tar.gz"
 IMAGE_FSTYPE ?= "tar.gz"
 
 # Things to include in the fs image
-MACHINE_FEATURES = "kernel26 pci ext2"
+MACHINE_FEATURES = "kernel26 pci ext2 x86"
 # The kernel and grub need to installed to boot from flash
 MACHINE_EXTRA_RDEPENDS = "kernel grub"
 
============================================================
--- conf/machine/x86-32-nocona.conf	23cb58df20b02ae0c028f4341041e6800d10f347
+++ conf/machine/x86-32-nocona.conf	4751fe71ac3de06ec5669fd29663ce396bf3ac4f
@@ -17,7 +17,7 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
============================================================
--- conf/machine/x86-prescott.conf	aaa114f1f2f973a0736d7df2a7ecef7794a59966
+++ conf/machine/x86-prescott.conf	c4bf154f03bb4818ad538b852d24e1d50e653d76
@@ -16,7 +16,7 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
============================================================
--- conf/machine/x86.conf	e40a530eadbc02e9ed6fd2d267d4a492bc1d403a
+++ conf/machine/x86.conf	28f63bda2b037a316931c0707a0db0f81b10a9cb
@@ -13,7 +13,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen x86"
 
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.17"
============================================================
--- packages/glib-2.0/glib-2.0_2.14.0.bb	21999f530ce7682e78fd14b67e5d29e2bf2c322f
+++ packages/glib-2.0/glib-2.0_2.14.0.bb	256b1c8d9f5d5b075470c1ead8e706218240944e
@@ -1,5 +1,6 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOM
 require glib.inc
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1 \
+           file://gcc-4.2-inline-fix.patch;patch=1"
-           file://configure-libtool.patch;patch=1"
============================================================
--- packages/lm_sensors/lmsensors-apps_2.10.1.bb	cfb415f977c0f9b8a4e012bd39fe5df35f0e6b2b
+++ packages/lm_sensors/lmsensors-apps_2.10.1.bb	098458d7451b302e662d248e4b54f392a787c643
@@ -5,22 +5,26 @@ SRC_URI = "http://dl.lm-sensors.org/lm-s
 PR = "r2"
 
 SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \
-           file://iconv.patch;patch=1 \
            file://prefix-fix.patch;patch=1 \
            file://add-sysfs-ldflags.patch;patch=1"
 
+SRC_URI_append_uclibc = "file://iconv.patch;patch=1"
+
 S = "${WORKDIR}/lm_sensors-${PV}"
 
 do_compile() {
-	oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user PROG_EXTRA=sensors PREFIX=${prefix}
+	oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user PROG_EXTRA=sensors 
 }
 
 do_install() {
 	oe_runmake user_install DESTDIR=${D}
 
-	# backward compatibility with older OE packages
-	mv ${D}${sbindir}/* ${D}${bindir}
+	install -d ${D}/.usr
+	mv ${D}/* ${D}/.usr
+	mv ${D}/.usr ${D}/usr
 
+	install -d ${D}${sysconfdir}
+	mv ${D}/usr/etc/sensors.conf ${D}${sysconfdir}
 	# move manuals into proper place
 	install -d ${D}${mandir}
 	rm -rf ${D}${mandir}/*
@@ -28,7 +32,7 @@ do_install() {
 
 	# remove perl or bash scripts
 	rm ${D}${bindir}/*.pl ${D}${bindir}/ddcmon
-	rm ${D}${bindir}/fancontrol ${D}${bindir}/pwmconfig ${D}${bindir}/sensors-detect
+	rm ${D}${sbindir}/fancontrol* ${D}${sbindir}/pwmconfig ${D}${sbindir}/sensors-detect
 	rm ${D}${mandir}/man8/fancontrol.8 ${D}${mandir}/man8/pwmconfig.8 ${D}${mandir}/man8/sensors-detect.8
 }
 






More information about the Openembedded-commits mailing list