diff options
| author | Mei Lei <lei.mei@intel.com> | 2011-12-28 11:22:17 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-01-02 20:26:25 -0800 |
| commit | 32d308bb38612cef2a98a4c40f058b4db50787aa (patch) | |
| tree | 10f83690491fc2335b0b218d0ce519d09b9ae0f8 | |
| parent | c0fc36f8629a6abb9a7b542df8a2857526547a31 (diff) | |
| download | openembedded-core-32d308bb38612cef2a98a4c40f058b4db50787aa.tar.gz openembedded-core-32d308bb38612cef2a98a4c40f058b4db50787aa.tar.bz2 openembedded-core-32d308bb38612cef2a98a4c40f058b4db50787aa.zip | |
rpm: Fix rpm database files capacity issue.
Tune the __db* size in DB_CONFIG.
This will reduce the __db* size from 62MB to 26MB in qemu.
[YOCTO #1769]
Signed-off-by: Mei Lei <lei.mei@intel.com>
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 |
3 files changed, 24 insertions, 1 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 30f3783e3c..999b8a6c86 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -61,6 +61,9 @@ fakeroot rootfs_rpm_do_rootfs () { mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir} mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir}/log + # After change the __db.* cache size, log file will not be generated automatically, + # that will raise some warnings, so touch a bare log for rpm write into it. + touch ${INSTALL_ROOTFS_RPM}${rpmlibdir}/log/log.0000000001 cat > ${INSTALL_ROOTFS_RPM}${rpmlibdir}/DB_CONFIG << EOF # ================ Environment set_data_dir . diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch b/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch new file mode 100644 index 0000000000..e063e86c44 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch @@ -0,0 +1,19 @@ +Upstream-Status: Inappropriate [configuration] + +Change cache size to reduce the usage of disk space from 62MB to 26MB. + +Signed-off-by: Mei Lei <lei.mei@intel.com> + +diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in +index e0b4689..b64e3a9 100644 +--- a/rpmdb/DB_CONFIG.in ++++ b/rpmdb/DB_CONFIG.in +@@ -29,7 +29,7 @@ set_thread_count 64 + + # ================ Memory Pool + #XXX initializing dbenv with set_cachesize has unimplemented prerequsites +-#set_cachesize 0 1048576 0 ++set_cachesize 0 1048576 0 + set_mp_mmapsize 268435456 + + # ================ Locking diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 122d3a922a..aae59eca5c 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb @@ -45,12 +45,13 @@ 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 = "r27" +PR = "r28" # 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... SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;extract=rpm-5.4.0.tar.gz \ file://rpm-log-auto-rm.patch \ + file://rpm-db-reduce.patch \ file://perfile_rpmdeps.sh \ file://rpm-autogen.patch \ file://rpm-libsql-fix.patch \ |