From bfd1efbf726e591303a6da689c8dbc86342c483e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Jul 2007 17:22:20 +0000 Subject: opie.bbclass: Install binaries to $bindir. * Per #2254. --- classes/opie.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 916a8a4a30..c11cf0b4de 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -80,6 +80,7 @@ python opie_do_opie_install() { D = "%s/image" % bb.data.getVar( "WORKDIR", d, True ) WORKDIR = bb.data.getVar( "WORKDIR", d, True ) palmtopdir = bb.data.getVar( "palmtopdir", d, True ) + gnubindir = bb.data.getVar( "bindir", d, True ) APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir ) if desktopdir is not None: @@ -89,11 +90,12 @@ python opie_do_opie_install() { os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) ) if APPTYPE == "binary": - os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) ) + os.system( "install -d %s%s/" % ( D, gnubindir ) ) + os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) ) elif APPTYPE == "quicklaunch": os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) ) - os.system( "install -d %s%s/bin/" % ( D, palmtopdir ) ) - os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) ) + os.system( "install -d %s%s/" % ( D, gnubindir ) ) + os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) ) elif APPTYPE == "plugin": os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) ) } -- cgit v1.2.3 From d8f8c8ae824998c9e7b886f0a6c3e0488e998cde Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Jul 2007 17:41:46 +0000 Subject: palmtop.bbclass: Update for FHS-compatible layout. --- classes/palmtop.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index e99b31aaa3..fa25d598e9 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -19,8 +19,7 @@ DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" -FILES_${PN} = " ${palmtopdir} " -FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so " +FILES_${PN} += " ${palmtopdir} " FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \ ${palmtopdir}/bin/.debug \ ${palmtopdir}/plugins/*/.debug " -- cgit v1.2.3 From e45268ec831c439a5159e147a02dccce7a6b4d0e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Jul 2007 23:34:18 +0000 Subject: bluez: Stop 02dtl1_cs.sh the nasty hack from breaking everyone's BT connection. * This sloppily written script just unconditionally breaks a BT connection on suspend. * So, instead, make only DTL1 victims suffer it thru: 1. Make a separate package for it. 2. Make kernel-module-dtl1-cs and nothing else RDEPENDS on it. --- classes/kernel.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 4cc3784b6f..3a95fa787a 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -183,6 +183,10 @@ ALLOW_EMPTY_kernel = "1" ALLOW_EMPTY_kernel-base = "1" ALLOW_EMPTY_kernel-image = "1" +# Userspace workarounds for kernel modules issues +# This is shame, fix the kernel instead! +RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" + pkg_postinst_kernel-image () { if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} -- cgit v1.2.3 From 725d9b9289e84ad450fe9a037bd78eaa50c1206f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 5 Jul 2007 11:24:00 +0000 Subject: kernel.bbclass: DEPEND on bluez-dtl1-workaround, not just RDEPEND. --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 3a95fa787a..afbea42391 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -185,7 +185,7 @@ ALLOW_EMPTY_kernel-image = "1" # Userspace workarounds for kernel modules issues # This is shame, fix the kernel instead! -RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" +DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" pkg_postinst_kernel-image () { if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then -- cgit v1.2.3 From 2ed2875b6c56be3a2f2b9db557e22024d3e92dd6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 5 Jul 2007 12:48:04 +0000 Subject: kernel.bbclass: Oh ok, we need both DEPENDS and RDEPENDS. --- classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index afbea42391..658bbbf675 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -186,6 +186,7 @@ ALLOW_EMPTY_kernel-image = "1" # Userspace workarounds for kernel modules issues # This is shame, fix the kernel instead! DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" +RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" pkg_postinst_kernel-image () { if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then -- cgit v1.2.3