Misc fixes and cleanups

PATCH In review Mark Hatle 2 participants 9 messages Dec 23, 2011 – Dec 27, 2011

lore

Share & tools

lore

Mark Hatle

author

2011-12-23 01:02 UTC #0 lore raw

cover Misc fixes and cleanups

Misc fixes and cleanups that affect various parts of the system...

The following changes since commit c38693f78c968ab5f4bb557c20d1c8c55393ed6b:

opkg: Fix installation order in feeds with mutiple providers of packages (2011-12-22 22:38:09 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/misc-fixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/misc-fixes

Mark Hatle (7):
package.bbclass: Adjust RPM call to use dynamic location for magic
files
package_rpm.bbclass: Add RPMSPEC_PREAMBLE
rpm_5.4.0: Fix configuration issue with native/nativesdk
udev: Remove linux-libc-headers dependency
gperf: Add missing SRC checksum
which: Add missing SRC checksums
base.bbclass: Allow buildstats to be optionally supplied

 meta/classes/base.bbclass                  |    1 -
 meta/classes/package.bbclass               |    2 +-
 meta/classes/package_rpm.bbclass           |    8 +++++++-
 meta/conf/local.conf.sample                |    3 ++-
 meta/recipes-core/udev/udev-new.inc        |    2 +-
 meta/recipes-devtools/rpm/rpm_5.4.0.bb     |    3 ++-
 meta/recipes-extended/gperf/gperf_3.0.3.bb |    3 +++
 meta/recipes-extended/which/which_2.18.bb  |    3 +++
 8 files changed, 19 insertions(+), 6 deletions(-)

Signature · 1 line

1.7.3.4

Mark Hatle

author

2011-12-23 01:02 UTC #1 lore raw

PATCH 1/7 package.bbclass: Adjust RPM call to use dynamic location for magic files

The magic file could be installed somewhere else if the system native prefix settings are changed. Adjust the packaging files to compensate for this.

Signed-off-by Mark Hatle <[email protected]>

---
 meta/classes/package.bbclass     |    2 +-
 meta/classes/package_rpm.bbclass |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/classes/package.bbclass +1 -1

index 39c1d4b..9040eb4 100644
@@ -1113,7 +1113,7 @@ if [ x"$D" = "x" ]; then
 fi
 }
 
-RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt"
+RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt"
 
 # Collect perfile run-time dependency metadata
 # Output:

meta/classes/package_rpm.bbclass +1 -1

index 93a4c31..469526b 100644
@@ -941,7 +941,7 @@ python do_package_rpm () {
 		d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
 	pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d)
 	pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d)
-	magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
+	magicfile = bb.data.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc', d)
 	bb.mkdirhier(pkgwritedir)
 	os.chmod(pkgwritedir, 0755)

Signature · 1 line

1.7.3.4

Mark Hatle

author

2011-12-23 01:02 UTC #2 lore raw

PATCH 2/7 package_rpm.bbclass: Add RPMSPEC_PREAMBLE

In reply to Mark Hatle

Add a way to add arbitrary text to the top of a spec file. This can be useful for adding specific tags to the produced binaries for tracking purposes.

Signed-off-by Mark Hatle <[email protected]>

---
 meta/classes/package_rpm.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

meta/classes/package_rpm.bbclass +6 -0

index 469526b..d03dc3f 100644
@@ -817,6 +817,12 @@ python write_specfile () {
 	except OSError:
 		raise bb.build.FuncFailed("unable to open spec file for writing.")
 
+	# RPMSPEC_PREAMBLE is a way to add arbitrary text to the top
+	# of the generated spec file
+	external_preamble = d.getVar("RPMSPEC_PREAMBLE", True)
+	if external_preamble:
+		specfile.write(external_preamble + "\n")
+
 	for line in spec_preamble_top:
 		specfile.write(line + "\n")

Signature · 1 line

1.7.3.4

Mark Hatle

author

2011-12-23 01:02 UTC #3 lore raw

PATCH 3/7 rpm_5.4.0: Fix configuration issue with native/nativesdk

In reply to Mark Hatle

RPM's configuration assumes if the prefix isn't /usr or /usr/local that you really want the DB in $prefix/var -- we want it in $localstatedir.

Signed-off-by Mark Hatle <[email protected]>

---
 meta/recipes-devtools/rpm/rpm_5.4.0.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

meta/recipes-devtools/rpm/rpm_5.4.0.bb +2 -1

index 2c0c076..122d3a9 100644
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
 extrarpmdeps_virtclass-native = "file-native"
-PR = "r26"
+PR = "r27"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...

@@ -347,6 +347,7 @@ do_configure() {
 
 	./autogen.sh
 
+	export varprefix=${localstatedir}
 	oe_runconf
 }

Signature · 1 line

1.7.3.4

Mark Hatle

author

2011-12-23 01:02 UTC #4 lore raw

PATCH 4/7 udev: Remove linux-libc-headers dependency

In reply to Mark Hatle

The linux-libc-headers dependency is not needed, as it is automatically inherited from the libc and other dependencies.

Signed-off-by Mark Hatle <[email protected]>

---
 meta/recipes-core/udev/udev-new.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-core/udev/udev-new.inc +1 -1

index e302c03..198336b 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-DEPENDS = "acl glib-2.0 libusb usbutils pciutils linux-libc-headers gperf-native libxslt-native"
+DEPENDS = "acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native"
 RPROVIDES_${PN} = "hotplug"
 RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids"
 RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})"

Signature · 1 line

1.7.3.4

Mark Hatle

author

2011-12-23 01:02 UTC #5 lore raw

PATCH 5/7 gperf: Add missing SRC checksum

In reply to Mark Hatle

Signed-off-by Mark Hatle <[email protected]>

---
 meta/recipes-extended/gperf/gperf_3.0.3.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

meta/recipes-extended/gperf/gperf_3.0.3.bb +3 -0

index 5cccdf1..e7acc1f 100644
@@ -5,3 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a5f84abb0070adf8a0925d7d534b6e0a \
                     file://src/main.cc;firstline=8;endline=19;md5=3eab12ba436c4da725b19b131def6de9"
 
 PR = "r1"
+
+SRC_URI[md5sum] = "cc20e58975a38075440423c8fb85fd00"
+SRC_URI[sha256sum] = "63287527c8d9e27e801cf0804436f3494bd569db05d49dcdd2a942ae72fa9055"

Signature · 1 line

1.7.3.4

Mark Hatle

author

2011-12-23 01:02 UTC #6 lore raw

PATCH 6/7 which: Add missing SRC checksums

In reply to Mark Hatle

Signed-off-by Mark Hatle <[email protected]>

---
 meta/recipes-extended/which/which_2.18.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

meta/recipes-extended/which/which_2.18.bb +3 -0

index 92010b2..f87929b 100644
@@ -14,6 +14,9 @@ PR = "r1"
 SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
            file://fix_name_conflict_group_member.patch"
 
+SRC_URI[md5sum] = "42d51938e48b91f6e19fabf216f5c3e9"
+SRC_URI[sha256sum] = "9445cd7e02ec0c26a44fd56098464ded064ba5d93dd2e15ec12410ba56b2e544"
+
 DEPENDS = "cwautomacros-native"
 
 inherit autotools update-alternatives

Signature · 1 line

1.7.3.4

Mark Hatle

author

2011-12-23 01:02 UTC #7 lore raw

PATCH 7/7 base.bbclass: Allow buildstats to be optionally supplied

In reply to Mark Hatle

Buildstats should be allowed to be optionally enabled. It's recommended that it be enabled via the USER_CLASSES setting.

Alternatively it could be enabled via the INHERIT_DISTRO or similar mechanism.

Signed-off-by Mark Hatle <[email protected]>

---
 meta/classes/base.bbclass   |    1 -
 meta/conf/local.conf.sample |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/classes/base.bbclass +0 -1

index fbcaefb..e65a722 100644
@@ -7,7 +7,6 @@ inherit mirrors
 inherit utils
 inherit utility-tasks
 inherit metadata_scm
-inherit buildstats
 inherit logging
 
 OE_IMPORTS += "os sys time oe.path oe.utils oe.data oe.packagegroup"

meta/conf/local.conf.sample +2 -1

index 73ab9f8..7d52d0e 100644
@@ -134,12 +134,13 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
 # The following is a list of additional classes to use when building images which
 # enable extra features. Some available options which can be included in this variable 
 # are:
+#   - 'buildstats' collect build statistics
 #   - 'image-mklibs' to reduce shared library files size for an image
 #   - 'image-prelink' in order to prelink the filesystem image
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
 #
 # Runtime testing of images

Signature · 1 line

1.7.3.4

Saul Wold

2011-12-27 18:39 UTC #8 lore raw

In reply to Mark Hatle

Quoted 10 lines · Mark Hatle

Misc fixes and cleanups that affect various parts of the system...
The following changes since commit c38693f78c968ab5f4bb557c20d1c8c55393ed6b:
opkg: Fix installation order in feeds with mutiple providers of packages (2011-12-22 22:38:09 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/misc-fixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/misc-fixes

Quoted 8 lines

Mark Hatle (7):
package.bbclass: Adjust RPM call to use dynamic location for magic
files
package_rpm.bbclass: Add RPMSPEC_PREAMBLE
rpm_5.4.0: Fix configuration issue with native/nativesdk
udev: Remove linux-libc-headers dependency
gperf: Add missing SRC checksum
which: Add missing SRC checksums

The Above were all merged to OE-Core

Thanks
Sau!

Quoted 2 lines

base.bbclass: Allow buildstats to be optionally supplied

No sure about this, no comments, but RP did not take it yet.

Sau!

Quoted 10 lines

  meta/classes/base.bbclass                  |    1 -
  meta/classes/package.bbclass               |    2 +-
  meta/classes/package_rpm.bbclass           |    8 +++++++-
  meta/conf/local.conf.sample                |    3 ++-
  meta/recipes-core/udev/udev-new.inc        |    2 +-
  meta/recipes-devtools/rpm/rpm_5.4.0.bb     |    3 ++-
  meta/recipes-extended/gperf/gperf_3.0.3.bb |    3 +++
  meta/recipes-extended/which/which_2.18.bb  |    3 +++
  8 files changed, 19 insertions(+), 6 deletions(-)