Skip to contentSkip to conversation

python-smartpm: Add checking for "rpm-ignoresize" option

PATCH New Chong Lu 1 participant 2 messages Oct 13, 2014

lore
Share & tools
lore

Chong Lu

author
#0 lore raw

cover python-smartpm: Add checking for "rpm-ignoresize" option

The following changes since commit ccf5a4d2342c4fd40e4e0b332ea7e34e0bf175d4:

build-appliance-image: Update to dizzy head revision (2014-10-11 08:11:17 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib chonglu/smart
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/smart

Chong Lu (1):
python-smartpm: Add checking for "rpm-ignoresize" option

 meta/lib/oe/package_manager.py                     |  1 +
 .../smart-add-for-rpm-ignoresize-check.patch       | 37 ++++++++++++++++++++++
 .../python/python-smartpm_1.4.1.bb                 |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 python-smartpm: Add checking for "rpm-ignoresize" option

The do_rootfs takes a very long time when build host has mounted many NFS devices. syscall lstat() was being called on every filesystem mounted on the build host during building.
The reason for the lstat() is that rpm is verifying that enough free disk space is available to do the install. However, since the install is into the target rootfs it should not matter how much free space there is in the host mounts. Add checking for "rpm-ignoresize", by it, smart can make whether RPM skip checking for diskspace when install a rpm package.

---
 meta/lib/oe/package_manager.py                     |  1 +
 .../smart-add-for-rpm-ignoresize-check.patch       | 37 ++++++++++++++++++++++
 .../python/python-smartpm_1.4.1.bb                 |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch
meta/lib/oe/package_manager.py +1 -0
index 27fdf26..ffb83b2 100644
@@ -838,6 +838,7 @@ class RpmPM(PackageManager):
                         % prefer_color)
 
         self._invoke_smart(cmd)
+        self._invoke_smart('config --set rpm-ignoresize=1')
 
         # Write common configuration for host and target usage
         self._invoke_smart('config --set rpm-nolinktos=1')
meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch new file +37 -0
new file mode 100644
index 0000000..8a27f25
@@ -0,0 +1,37 @@
+python-smartpm: Add checking for "rpm-ignoresize" option
+
+The do_rootfs takes a very long time when build host has mounted many NFS
+devices. syscall lstat() was being called on every filesystem mounted on the
+build host during building.
+The reason for the lstat() is that rpm is verifying that enough free disk space
+is available to do the install. However, since the install is into the target
+rootfs it should not matter how much free space there is in the host mounts.
+Add checking for "rpm-ignoresize", by it, smart can make whether RPM skip
+checking for diskspace when install a rpm package.
+
+Upstream-Status: Pending
+
+Signed-off-by: wenlin.kang <[email protected]>
+Signed-off-by: Chong Lu <[email protected]>
+---
+ smart/backends/rpm/pm.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/smart/backends/rpm/pm.py b/smart/backends/rpm/pm.py
+index 5da9ee6..f0488ec 100644
+--- a/smart/backends/rpm/pm.py
++++ b/smart/backends/rpm/pm.py
+@@ -241,6 +241,10 @@ class RPMPackageManager(PackageManager):
+         except AttributeError:
+             probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
+ 
++        if sysconf.get("rpm-ignoresize", False):
++            probfilter |= rpm.RPMPROB_FILTER_DISKNODES
++            probfilter |= rpm.RPMPROB_FILTER_DISKSPACE
++
+         if force or reinstall:
+             probfilter |= rpm.RPMPROB_FILTER_REPLACEPKG
+             probfilter |= rpm.RPMPROB_FILTER_REPLACEOLDFILES
+-- 
+1.9.1
+
meta/recipes-devtools/python/python-smartpm_1.4.1.bb +1 -0
index f2eb33d..c75f10f 100644
@@ -33,6 +33,7 @@ SRC_URI = "\
           file://smart-attempt.patch \
           file://smart-filename-NAME_MAX.patch \
           file://smart-rpm4-fixes.patch \
+          file://smart-add-for-rpm-ignoresize-check.patch \
          "
 
 SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"
Signature · 1 line
1.9.1