Unbork the lsof build with uclibc, and kill off the old lsof versions.

BKrev: 419ee791ozL02HcKNqEtHvdJBjOfow

4 files changed, 5 insertions, 107 deletions

diff --git a/lsof/lsof_4.69.oe b/lsof/lsof_4.69.oe
deleted file mode 100644
index f2ae3a3062..0000000000
--- a/lsof/lsof_4.69.oe
+++ /dev/null
@@ -1,35 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "Lsof is a Unix-specific diagnostic \
-tool. Its name stands for LiSt Open Files, and it \
-does just that."
-
-SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.gz"
-LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
-S = "${WORKDIR}/lsof_${PV}_src"
-
-python do_unpack () {
-	oe.build.exec_func('base_do_unpack', d)
-	src_uri = oe.data.getVar('SRC_URI', d)
-	oe.data.setVar('SRC_URI', '${LOCALSRC}', d)
-	oe.build.exec_func('base_do_unpack', d)
-	oe.data.setVar('SRC_URI', src_uri, d)
-}
-
-do_configure () {
-	echo PWD is $PWD
-	./Configure ${TARGET_OS}
-}
-
-export I = "${STAGING_INCDIR}"
-export L = "${STAGING_INCDIR}"
-export EXTRA_OEMAKE = ""
-
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}'
-}
-
-do_install () {
-	install -d ${D}/${sbindir} ${D}/${mandir}/man8
-	install -m 4755 lsof ${D}/${sbindir}/lsof
-	install -m 0644 lsof.8 ${D}/${mandir}/man8/lsof.8
-}
diff --git a/lsof/lsof_4.70.oe b/lsof/lsof_4.70.oe
deleted file mode 100644
index f2ae3a3062..0000000000
--- a/lsof/lsof_4.70.oe
+++ /dev/null
@@ -1,35 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "Lsof is a Unix-specific diagnostic \
-tool. Its name stands for LiSt Open Files, and it \
-does just that."
-
-SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.gz"
-LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
-S = "${WORKDIR}/lsof_${PV}_src"
-
-python do_unpack () {
-	oe.build.exec_func('base_do_unpack', d)
-	src_uri = oe.data.getVar('SRC_URI', d)
-	oe.data.setVar('SRC_URI', '${LOCALSRC}', d)
-	oe.build.exec_func('base_do_unpack', d)
-	oe.data.setVar('SRC_URI', src_uri, d)
-}
-
-do_configure () {
-	echo PWD is $PWD
-	./Configure ${TARGET_OS}
-}
-
-export I = "${STAGING_INCDIR}"
-export L = "${STAGING_INCDIR}"
-export EXTRA_OEMAKE = ""
-
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}'
-}
-
-do_install () {
-	install -d ${D}/${sbindir} ${D}/${mandir}/man8
-	install -m 4755 lsof ${D}/${sbindir}/lsof
-	install -m 0644 lsof.8 ${D}/${mandir}/man8/lsof.8
-}
diff --git a/lsof/lsof_4.72.oe b/lsof/lsof_4.72.oe
deleted file mode 100644
index f2ae3a3062..0000000000
--- a/lsof/lsof_4.72.oe
+++ /dev/null
@@ -1,35 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "Lsof is a Unix-specific diagnostic \
-tool. Its name stands for LiSt Open Files, and it \
-does just that."
-
-SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.gz"
-LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
-S = "${WORKDIR}/lsof_${PV}_src"
-
-python do_unpack () {
-	oe.build.exec_func('base_do_unpack', d)
-	src_uri = oe.data.getVar('SRC_URI', d)
-	oe.data.setVar('SRC_URI', '${LOCALSRC}', d)
-	oe.build.exec_func('base_do_unpack', d)
-	oe.data.setVar('SRC_URI', src_uri, d)
-}
-
-do_configure () {
-	echo PWD is $PWD
-	./Configure ${TARGET_OS}
-}
-
-export I = "${STAGING_INCDIR}"
-export L = "${STAGING_INCDIR}"
-export EXTRA_OEMAKE = ""
-
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}'
-}
-
-do_install () {
-	install -d ${D}/${sbindir} ${D}/${mandir}/man8
-	install -m 4755 lsof ${D}/${sbindir}/lsof
-	install -m 0644 lsof.8 ${D}/${mandir}/man8/lsof.8
-}
diff --git a/lsof/lsof_4.73.oe b/lsof/lsof_4.73.oe
index 614916ada4..cf4ffc4f5e 100644
--- a/lsof/lsof_4.73.oe
+++ b/lsof/lsof_4.73.oe
@@ -2,6 +2,7 @@ SECTION = "console/utils"
 DESCRIPTION = "Lsof is a Unix-specific diagnostic \
 tool. Its name stands for LiSt Open Files, and it \
 does just that."
+PR = "r1"
 
 SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.gz"
 LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
@@ -15,9 +16,11 @@ python do_unpack () {
 	oe.data.setVar('SRC_URI', src_uri, d)
 }
 
+LSOF_OS = "${TARGET_OS}"
+LSOF_OS_linux-uclibc = "linux"
+
 do_configure () {
-	echo PWD is $PWD
-	./Configure ${TARGET_OS}
+	./Configure ${LSOF_OS}
 }
 
 export I = "${STAGING_INCDIR}"