Cleanups

PATCH New Paul Eggleton 1 participant 4 messages Dec 13, 2012

Share & tools

Paul Eggleton

author

2012-12-13 15:08 UTC #0 lore raw

cover Cleanups

"startline" -> "beginline" for LIC_FILES_CHKSUM in meta-oe and meta-networking, as well as removing libnl which is now in OE-Core.

The following changes since commit f36e2e2ea4edcd4a0e65ed1c213bce388231214c:

gcalctool: upgrade to 5.32.0 (2012-12-11 01:54:24 +0100)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/cleanup5
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/cleanup5

Paul Eggleton (3):
Fix erroneous use of "startline" in LIC_FILES_CHKSUM Fix erroneous use of "startline" in LIC_FILES_CHKSUM
libnl: remove

 .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb       |    4 +-
 meta-networking/recipes-support/mtr/mtr_0.82.bb    |    2 +-
 meta-networking/recipes-support/tunctl/tunctl.inc  |    2 +-
 meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb |    2 +-
 meta-oe/recipes-extended/lcdproc/lcdproc5.inc      |    2 +-
 .../socketcan/libsocketcan_0.0.8.bb                |    2 +-
 meta-oe/recipes-extended/tmux/tmux_1.6.bb          |    2 +-
 meta-oe/recipes-support/libnl/libnl_3.2.9.bb       |   52 --------------------
 meta-oe/recipes-support/mini-iconv/mini-iconv.bb   |    2 +-
 9 files changed, 9 insertions(+), 61 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libnl/libnl_3.2.9.bb

Signature · 1 line

1.7.10.4

Paul Eggleton

author

2012-12-13 15:08 UTC #1 lore raw

PATCH 1/3 Fix erroneous use of "startline" in LIC_FILES_CHKSUM

"beginline" is the correct parameter name. Checksums have been updated where necessary (i.e. if the beginning line was something other than the default of 1).

Signed-off-by Paul Eggleton <[email protected]>

---
 meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb       |    2 +-
 meta-oe/recipes-extended/lcdproc/lcdproc5.inc            |    2 +-
 meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb |    2 +-
 meta-oe/recipes-extended/tmux/tmux_1.6.bb                |    2 +-
 meta-oe/recipes-support/mini-iconv/mini-iconv.bb         |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb +1 -1

index 3000dbb..7e0a4fb 100644
@@ -7,7 +7,7 @@ SECTION = "console"
 LICENSE = "GPLv3+"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
-                    file://main_common.cc;startline=5;endline=16;md5=0ef2c1bede11c6c9c6c12330d60bc7a7"
+                    file://main_common.cc;beginline=5;endline=16;md5=b5a59150a33658cc1ffc31b1a4ffb9f2"
 
 SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz"
 SRC_URI[md5sum] = "57b67407e882c6418531d48a2f20d16b"

meta-oe/recipes-extended/lcdproc/lcdproc5.inc +1 -1

index 76669be..4040870 100644
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
 DEPENDS = "virtual/libusb0 ncurses"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
-                    file://README;startline=60;md5=8237b4d4d80a525b15f8162192e07bee"
+                    file://README;beginline=60;md5=637e042cdd3671ba00e78b58ede45d3b"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz"

meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb +1 -1

index cf6c212..89b4f06 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.pengutronix.de"
 SECTION = "libs/network"
 
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://src/libsocketcan.c;startline=3;endline=17;md5=2c5c54d58b42d2216f34759062be3ddb"
+LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1"
 
 SRCREV = "3a2cec63a4e6212cc63d21008453bd799cfe8774"

meta-oe/recipes-extended/tmux/tmux_1.6.bb +1 -1

index fa58065..6be2355 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://tmux.sourceforge.net"
 SECTION = "console/utils"
 
 LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://tmux.c;startline=3;endline=17;md5=f36d9c9e6c1c24996a88891fdf783d04"
+LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=8685b4455330a940fab1ff451aa941a0"
 
 DEPENDS = "ncurses libevent sed-native"

meta-oe/recipes-support/mini-iconv/mini-iconv.bb +1 -1

index 7d5bc68..3150013 100644
@@ -8,7 +8,7 @@ SECTION = "libs"
 DEPENDS = ""
 PROVIDES = "virtual/libiconv"
 PR = "r0"
-LIC_FILES_CHKSUM = "file://iconv.c;startline=1;endline=6;md5=35af9d9924327fe8a0a1fe3a2cb454c8"
+LIC_FILES_CHKSUM = "file://iconv.c;beginline=1;endline=6;md5=35af9d9924327fe8a0a1fe3a2cb454c8"
 SRC_URI = "http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/mini-iconv.tar.bz2"
 SRC_URI[md5sum] = "84412221e26505a2b3855d4a1cdcd0e0"
 SRC_URI[sha256sum] = "3552262bf1bcf8e859a2a3a7adfb0367af8593383e730c492e981477aac0a0d4"

Signature · 1 line

1.7.10.4

Paul Eggleton

author

2012-12-13 15:08 UTC #2 lore raw

PATCH 2/3 Fix erroneous use of "startline" in LIC_FILES_CHKSUM

In reply to Paul Eggleton

"beginline" is the correct parameter name. Checksums have been updated where necessary (i.e. if the beginning line was something other than the default of 1).

Signed-off-by Paul Eggleton <[email protected]>

---
 meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb |    4 ++--
 meta-networking/recipes-support/mtr/mtr_0.82.bb          |    2 +-
 meta-networking/recipes-support/tunctl/tunctl.inc        |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +2 -2

index 40294b0..af48455 100644
@@ -8,8 +8,8 @@ and should not be enabled unless it is expressly needed."
 DEPENDS = "tcp-wrappers readline"
 SECTION = "network"
 LICENSE = "BSD-4-Clause"
-LIC_FILES_CHKSUM = "file://MCONFIG.in;startline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \
-                    file://tftp/tftp.c;startline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4"
+LIC_FILES_CHKSUM = "file://MCONFIG.in;beginline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \
+                    file://tftp/tftp.c;beginline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4"
 
 PR = "r0"

meta-networking/recipes-support/mtr/mtr_0.82.bb +1 -1

index c6d5152..3a93948 100644
@@ -5,7 +5,7 @@ DEPENDS = "ncurses"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-                    file://mtr.c;startline=5;endline=16;md5=87105f8fe9675e897e074869afaafa6f"
+                    file://mtr.c;beginline=5;endline=16;md5=56e390ced194aff352eefab404883057"
 
 SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz \
            file://no-gtk.patch"

meta-networking/recipes-support/tunctl/tunctl.inc +1 -1

index 952af24..29aed44 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Tool for controlling the Linux TUN/TAP driver"
 SECTION = "net"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://tunctl.c;startline=1;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999"
+LIC_FILES_CHKSUM = "file://tunctl.c;beginline=1;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz"

Signature · 1 line

1.7.10.4

Paul Eggleton

author

2012-12-13 15:08 UTC #3 lore raw

PATCH 3/3 libnl: remove

In reply to Paul Eggleton

Version 3.2.14 is now in OE-Core.

Signed-off-by Paul Eggleton <[email protected]>

---
 meta-oe/recipes-support/libnl/libnl_3.2.9.bb |   52 --------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libnl/libnl_3.2.9.bb

meta-oe/recipes-support/libnl/libnl_3.2.9.bb deleted +0 ~~-52~~

deleted file mode 100644
index 11b901c..0000000
@@ -1,52 +0,0 @@
-DESCRIPTION = "libnl is a library for applications dealing with netlink sockets."
-HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
-SECTION = "libs/network"
-
-PE = "1"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "flex-native bison-native"
-
-SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz"
-
-SRC_URI[md5sum] = "c13adec0239b266207fff07d79e5ce9e"
-SRC_URI[sha256sum] = "9f23e9460bd9bb7fbe09af5eb281e4a43a26fa245ea864ed5e28fe4e8118af63"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-    # make wpa-supplicant happy
-    # TODO: when moving to oe-core fix at wpa-supplicant
-    # (e.g src/drivers/drivers.mak)
-    cd ${D}${includedir}
-    ln -sf libnl3/netlink netlink
-    cd ${D}${libdir}
-    ln -sf libnl-3.so.200 libnl.so
-    ln -sf libnl-3.so.200 libnl.so.3
-    ln -sf libnl-genl-3.so.200 libnl-genl.so
-    ln -sf libnl-genl-3.so.200 libnl-genl.so.3
-}
-
-FILES_${PN} = "${libdir}/libnl-3.so.* \
-               ${libdir}/libnl.so.* \
-               ${sysconfdir}"
-RREPLACES_${PN} = "libnl2"
-RCONFLICTS_${PN} = "libnl2"
-FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug"
-FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \
-                    ${libdir}/libnl/cli/*/*.la"
-FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
-
-PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl"
-FILES_${PN}-cli   = "${libdir}/libnl-cli-3.so.* \
-                     ${libdir}/libnl/cli/*/*.so.* \
-                     ${sbindir}/nl-*"
-FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
-FILES_${PN}-nf    = "${libdir}/libnl-nf-3.so.*"
-FILES_${PN}-genl  = "${libdir}/libnl-genl-3.so.* \
-                     ${libdir}/libnl-genl.so.* \
-                     ${sbindir}/genl-ctrl-list"
-RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200"
-RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200"

Signature · 1 line

1.7.10.4