Skip to contentSkip to conversation

Recipe cleanups

PATCH New Paul Eggleton 1 participant 8 messages Nov 26, 2013

lore
Share & tools
lore
#0 lore raw

cover Recipe cleanups

The following changes since commit 4482af07df26644885bae49b98f5d765a5caa68c:

qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng (2013-11-26 12:09:51 +0000)

are available in the git repository at:

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

Paul Eggleton (7):
squashfs-tools: drop FILESPATHPKG
squashfs-tools: set SUMMARY instead of DESCRIPTION
alsa-utils-alsaconf: tidy up path setting
eee-acpi-scripts: tidy up recipe
dropbear: set SUMMARY instead of DESCRIPTION
libpng: set reasonable SUMMARY
Don't set DESCRIPTION to the same value as SUMMARY

 meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb | 15 ++++++++-------
 meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb   |  1 -
 meta/recipes-core/dropbear/dropbear.inc                   |  2 +-
 meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb |  1 -
 .../docbook-dsssl-stylesheets-native_1.79.bb              |  1 -
 meta/recipes-devtools/dosfstools/dosfstools_2.11.bb       |  1 -
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb        |  1 -
 meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb   |  1 -
 meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb    |  1 -
 .../recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb |  5 +----
 meta/recipes-extended/cups/cups.inc                       |  1 -
 meta/recipes-extended/grep/grep_2.15.bb                   |  1 -
 meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb  |  1 -
 meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb    |  1 -
 meta/recipes-extended/shadow/shadow.inc                   |  1 -
 meta/recipes-lsb4/libpng/libpng12_1.2.50.bb               |  3 +--
 meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb          |  1 -
 .../alsa/alsa-utils-alsaconf_1.0.27.2.bb                  |  3 +--
 meta/recipes-multimedia/libpng/libpng_1.6.6.bb            |  3 +--
 meta/recipes-support/libevent/libevent_2.0.21.bb          |  1 -
 20 files changed, 13 insertions(+), 32 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/7 squashfs-tools: drop FILESPATHPKG

Drop FILESPATHPKG setting since it seems to be superfluous.

---
 meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb +0 -3
index 00b68ab..5de02cd 100644
@@ -37,9 +37,6 @@ do_install () {
         install -m 0755 mksquashfs ${D}${sbindir}/
 }
 
-# required to share same place with -lzma specific packages
-FILESPATHPKG =. "squashfs-tools-${PV}:"
-
 ARM_INSTRUCTION_SET = "arm"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/7 squashfs-tools: set SUMMARY instead of DESCRIPTION

In reply to Paul Eggleton

Also tidy up value a little bit.

---
 meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb +1 -1
index 5de02cd..57400cd 100644
@@ -1,6 +1,6 @@
 # Note, we can probably remove the lzma option as it has be replaced with xz,
 # and I don't think the kernel supports it any more.
-DESCRIPTION = "Tools to manipulate Squashfs filesystems."
+SUMMARY = "Tools for manipulating SquashFS filesystems"
 SECTION = "base"
 LICENSE = "GPL-2 & PD"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 3/7 alsa-utils-alsaconf: tidy up path setting

In reply to Paul Eggleton

* Set FILESEXTRAPATHS instead of FILESPATH
* Don't set THISDIR, it's already set by base.bbclass

---
 meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb +1 -2
index a3fa1d0..cacc37c 100644
@@ -1,7 +1,6 @@
 require alsa-utils_${PV}.bb
 
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/alsa-utils"], d)}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-utils:"
 
 PACKAGES = "${PN}"
 RDEPENDS_${PN} += "bash"
Signature · 1 line
1.8.1.2
#4 lore raw

PATCH 4/7 eee-acpi-scripts: tidy up recipe

In reply to Paul Eggleton

* Set SUMMARY instead of DESCRIPTION
* Move packaging variables to the end
* Fix spacing in LICENSE assignment
* Fix indenting

---
 meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +8 -7
index 5f613f6..c2a02aa 100644
@@ -1,15 +1,13 @@
-DESCRIPTION = "eeePC specific ACPI scripts"
+SUMMARY = "eeePC specific ACPI scripts"
 HOMEPAGE = "http://alioth.debian.org/projects/debian-eeepc/"
 SECTION = "base"
 
-LICENSE="GPLv2"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c"
 
 SRCREV = "9d4cdedca25b396405f8587f9c4fbf8229e041c2"
 PV = "1.1.12+git${SRCPV}"
 
-RDEPENDS_${PN} = "pm-utils"
-
 SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git \
 	   file://remove-doc-check.patch \
 	   file://powerbtn.patch \
@@ -18,9 +16,9 @@ SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git \
 S = "${WORKDIR}/git"
 
 FILES_${PN} = "${datadir}/acpi-support/ \
-		${datadir}/eeepc-acpi-scripts \
-		${sysconfdir}/default/ \
-		${sysconfdir}/acpi/"
+               ${datadir}/eeepc-acpi-scripts \
+               ${sysconfdir}/default/ \
+               ${sysconfdir}/acpi/"
 
 do_install () {
 	install -d ${D}${sysconfdir}/default/
@@ -36,3 +34,6 @@ do_install () {
 	install -m 0644 ${WORKDIR}/policy-funcs ${D}${datadir}/acpi-support/
 	install -m 0644 ${S}/debian/eeepc-acpi-scripts.default* ${D}${sysconfdir}/default/
 }
+
+RDEPENDS_${PN} = "pm-utils"
+
Signature · 1 line
1.8.1.2
#5 lore raw

PATCH 5/7 dropbear: set SUMMARY instead of DESCRIPTION

In reply to Paul Eggleton
---
 meta/recipes-core/dropbear/dropbear.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/dropbear/dropbear.inc +1 -1
index ee17d9f..5d9623d 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "Dropbear is a lightweight SSH and SCP implementation"
+SUMMARY = "A lightweight SSH and SCP implementation"
 HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
 SECTION = "console/network"
 
Signature · 1 line
1.8.1.2
#6 lore raw

PATCH 6/7 libpng: set reasonable SUMMARY

In reply to Paul Eggleton

Also don't set DESCRIPTION to the same value, it's superfluous.

---
 meta/recipes-lsb4/libpng/libpng12_1.2.50.bb    | 3 +--
 meta/recipes-multimedia/libpng/libpng_1.6.6.bb | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
meta/recipes-lsb4/libpng/libpng12_1.2.50.bb +1 -2
index 95d5fb1..29d581b 100644
@@ -1,5 +1,4 @@
-SUMMARY = "PNG Library"
-DESCRIPTION = "PNG Library"
+SUMMARY = "PNG image format decoding library"
 HOMEPAGE = "http://www.libpng.org/"
 SECTION = "libs"
 LICENSE = "Libpng"
meta/recipes-multimedia/libpng/libpng_1.6.6.bb +1 -2
index 376dd53..7bc8141 100644
@@ -1,5 +1,4 @@
-SUMMARY = "PNG Library"
-DESCRIPTION = "PNG Library"
+SUMMARY = "PNG image format decoding library"
 HOMEPAGE = "http://www.libpng.org/"
 SECTION = "libs"
 LICENSE = "Libpng"
Signature · 1 line
1.8.1.2
#7 lore raw

PATCH 7/7 Don't set DESCRIPTION to the same value as SUMMARY

In reply to Paul Eggleton

Setting DESCRIPTION to the same value as SUMMARY doesn't do anything, since the value of DESCRIPTION will be derived from SUMMARY if not specified.

---
 meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb                  | 1 -
 meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb                | 1 -
 .../docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb   | 1 -
 meta/recipes-devtools/dosfstools/dosfstools_2.11.bb                      | 1 -
 meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb     | 1 -
 meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb                  | 1 -
 meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb                   | 1 -
 meta/recipes-extended/cups/cups.inc                                      | 1 -
 meta/recipes-extended/grep/grep_2.15.bb                                  | 1 -
 meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb                 | 1 -
 meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb                   | 1 -
 meta/recipes-extended/shadow/shadow.inc                                  | 1 -
 meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb                         | 1 -
 meta/recipes-support/libevent/libevent_2.0.21.bb                         | 1 -
 14 files changed, 14 deletions(-)
meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb +0 -1
index f840d8b..fcc9e87 100644
@@ -1,5 +1,4 @@
 SUMMARY = "NFS id mapping library"
-DESCRIPTION = "NFS id mapping library"
 HOMEPAGE = "http://www.citi.umich.edu/projects/nfsv4/linux/"
 SECTION = "libs"
 
meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb +0 -1
index 2ae3f4a..38de407 100644
@@ -2,7 +2,6 @@
 # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 SUMMARY = "A set of tools for CD recording, including cdrecord"
-DESCRIPTION = "A set of tools for CD recording, including cdrecord"
 HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html"
 SECTION = "console/utils"
 LICENSE = "GPLv2 & CDDL-1.0 & LGPLv2.1+"
meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb +0 -1
index c70e76d..e623690 100644
@@ -1,5 +1,4 @@
 SUMMARY = "DSSSL stylesheets used to transform SGML and XML DocBook files"
-DESCRIPTION = "DSSSL stylesheets used to transform SGML and XML DocBook files"
 HOMEPAGE= "http://docbook.sourceforge.net"
 # Simple persmissive
 LICENSE = "DSSSL"
meta/recipes-devtools/dosfstools/dosfstools_2.11.bb +0 -1
index b7b85f0..a6a7ddc 100644
@@ -2,7 +2,6 @@
 # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 SUMMARY = "DOS FAT Filesystem Utilities"
-DESCRIPTION = "DOS FAT Filesystem Utilities"
 
 SECTION = "base"
 LICENSE = "GPLv2"
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +0 -1
index ba9c72e..ea0ffcb 100644
@@ -1,5 +1,4 @@
 SUMMARY = "Convert LinuxDoc SGML source into other formats"
-DESCRIPTION = "Convert LinuxDoc SGML source into other formats"
 HOMEPAGE = "http://packages.debian.org/linuxdoc-tools"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931"
meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +0 -1
index fbf9e77..fe03b82 100644
@@ -1,5 +1,4 @@
 SUMMARY = "Qemu helper scripts"
-DESCRIPTION = "Qemu helper scripts"
 LICENSE = "GPLv2"
 RDEPENDS_${PN} = "nativesdk-qemu"
 PR = "r9"
meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb +0 -1
index 1b612c0..be03fc5 100644
@@ -1,5 +1,4 @@
 SUMMARY = "A simple post-processor for SGMLS and NSGMLS"
-DESCRIPTION = "A simple post-processor for SGMLS and NSGMLS"
 HOMEPAGE = "http://search.cpan.org/src/DMEGG/SGMLSpm-1.03ii/DOC/HTML/SGMLSpm/sgmlspm.html"
 SECTION = "libs"
 LICENSE = "GPLv2+"
meta/recipes-extended/cups/cups.inc +0 -1
index 62295b7..cb5b1a7 100644
@@ -1,5 +1,4 @@
 SUMMARY = "An Internet printing system for Unix"
-DESCRIPTION = "An Internet printing system for Unix."
 SECTION = "console/utils"
 LICENSE = "GPLv2 & LGPLv2"
 DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb"
meta/recipes-extended/grep/grep_2.15.bb +0 -1
index b6aa882..b24188f 100644
@@ -1,5 +1,4 @@
 SUMMARY = "GNU grep utility"
-DESCRIPTION = "GNU grep utility"
 HOMEPAGE = "http://savannah.gnu.org/projects/grep/"
 BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep"
 SECTION = "console/utils"
meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb +0 -1
index 4a1f79f..9d2ca4d 100644
@@ -1,5 +1,4 @@
 SUMMARY = "Provider of the machine specific securetty file"
-DESCRIPTION = "Provider of the machine specific securetty file"
 SECTION = "base utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb +0 -1
index d379c1f..697569c 100644
@@ -1,5 +1,4 @@
 SUMMARY = "Shadow utils requirements for useradd.bbclass"
-DESCRIPTION = "Shadow utils requirements for useradd.bbclass"
 HOMEPAGE = "http://pkg-shadow.alioth.debian.org"
 BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580"
 SECTION = "base utils"
meta/recipes-extended/shadow/shadow.inc +0 -1
index 5ab978a..33ecc7d 100644
@@ -1,5 +1,4 @@
 SUMMARY = "Tools to change and administer password and group data"
-DESCRIPTION = "Tools to change and administer password and group data"
 HOMEPAGE = "http://pkg-shadow.alioth.debian.org"
 BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580"
 SECTION = "base utils"
meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb +0 -1
index c18bc11..1125e14 100644
@@ -1,5 +1,4 @@
 SUMMARY = "Perl module for provides screen dump of Perl data."
-DESCRIPTION = "Perl module for provides screen dump of Perl data."
 
 HOMEPAGE = "http://search.cpan.org/~flora/Dumpvalue/"
 SECTION = "libs"
meta/recipes-support/libevent/libevent_2.0.21.bb +0 -1
index 2fbe659..5a1ff3b 100644
@@ -1,5 +1,4 @@
 SUMMARY = "An asynchronous event notification library"
-DESCRIPTION = "An asynchronous event notification library"
 HOMEPAGE = "http://libevent.org/"
 BUGTRACKER = "http://sourceforge.net/tracker/?group_id=50884&atid=461322"
 SECTION = "libs"
Signature · 1 line
1.8.1.2