Patchwork linux-atm: cleanup build file to remove extraneous stuff

login
register
mail settings
Submitter kernel-hacker@bennee.com
Date June 14, 2011, 10:44 a.m.
Message ID <1308048259-6125-1-git-send-email-kernel-hacker@bennee.com>
Download mbox | patch
Permalink /patch/5923/
State New, archived
Headers show

Comments

kernel-hacker@bennee.com - June 14, 2011, 10:44 a.m.
From: Alex Bennee <ajb@cbnl.com>

The recipe inherited a bunch of un-deeded guff from the previous
version which wasn't needed. The normal make install mechanics ensure
the packages are correctly created.

I have added a install_append to install the very useful aping binary
which upstream don't include in the normal install.

Signed-off-by: Alex Bennee <ajb@cbnl.com>
---
 recipes/linux-atm/linux-atm_2.5.1.bb |   34 +++++++---------------------------
 1 files changed, 7 insertions(+), 27 deletions(-)

Patch

diff --git a/recipes/linux-atm/linux-atm_2.5.1.bb b/recipes/linux-atm/linux-atm_2.5.1.bb
index 04af91b..7cc596b 100644
--- a/recipes/linux-atm/linux-atm_2.5.1.bb
+++ b/recipes/linux-atm/linux-atm_2.5.1.bb
@@ -3,7 +3,7 @@  HOMEPAGE = "http://linux-atm.sourceforge.net/"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/kernel flex flex-native"
-PR = "r1"
+PR = "r2"
 LICENSE = "GPL LGPL"
 
 SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/linux-atm/linux-atm-${PV}.tgz;name=tgz"
@@ -14,37 +14,17 @@  SRC_URI[tgz.sha256sum] = "6bc60fe53c9e9c828a6d7f3675da11ad7fb54491863584e01c1051
 
 inherit autotools pkgconfig flow-lossage
 
-
-headers_include="atmd.h atm.h atmsap.h"
-headers_arpd="atmarp.h atmarpd.h"
-
-binarys_sbin="maint/atmaddr maint/atmloop lane/bus ilmid/ilmid mpoad/mpcd arpd/atmarp sigd/atmsigd maint/enitune lane/lecs led/zeppelin arpd/atmarpd maint/atmtcp maint/esi lane/les maint/zntune"
-binarys_bin="test/aread maint/atmdiag maint/atmdump test/awrite maint/saaldump maint/sonetdiag test/ttcp_atm"
-
-
 do_compile_prepend() {
 	oe_runmake -C ${S}/src/qgen AR='${BUILD_AR}' CPP='${BUILD_CPP}' CC='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' DEFS='-I${S}/src -I. -I../.. -DHAVE_CONFIG_H' CPPFLAGS='${BUILD_CPPFLAGS}' LD='${BUILD_LD}' LDFLAGS='${BUILD_LDFLAGS}' qgen
 	oe_runmake -C ${S}/src/qgen DEFS='-I${S}/src -I. -I../.. -DHAVE_CONFIG_H' all
 }
 
-do_stage () {
-	oe_libinstall -so -C src/lib libatm ${STAGING_LIBDIR}
-
-	for i in ${headers_include}; do
-		install -m 0644 src/include/$i ${STAGING_INCDIR}/$i
-	done
-
-	for i in ${headers_arpd}; do
-		install -m 0644 src/arpd/$i ${STAGING_INCDIR}/$i
-	done
-
-	for i in ${binarys_sbin}; do
-		install -m 0755 src/$i ${STAGING_BINDIR}/`basename $i`
-	done
+# The upstream declares some binaries as _noinst in automake
+# even though they are quite useful.
 
-	for i in ${binarys_bin}; do
-		install -m 0755 src/$i ${STAGING_BINDIR}/`basename $i`
+extra_bins="src/test/.libs/aping"
+do_install_append() {
+	for i in ${extra_bins}; do
+	    install -m 0644 $i ${D}${bindir}/
 	done
 }
-
-