summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-12-28 11:22:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:26 +0000
commit86e3dff276f79b1dd801d296663439f038393948 (patch)
treefc70d4b6a214b0329c3bbb22c868e8ef29b42be6 /meta
parent38c2f66ea79f3ee3fed1757160340548e7687181 (diff)
downloadpoky-86e3dff276f79b1dd801d296663439f038393948.tar.gz
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] (From OE-Core rev: 32d308bb38612cef2a98a4c40f058b4db50787aa) Signed-off-by: Mei Lei <lei.mei@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/rootfs_rpm.bbclass3
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch19
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb3
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 () {
61 61
62 mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir} 62 mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir}
63 mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir}/log 63 mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir}/log
64 # After change the __db.* cache size, log file will not be generated automatically,
65 # that will raise some warnings, so touch a bare log for rpm write into it.
66 touch ${INSTALL_ROOTFS_RPM}${rpmlibdir}/log/log.0000000001
64 cat > ${INSTALL_ROOTFS_RPM}${rpmlibdir}/DB_CONFIG << EOF 67 cat > ${INSTALL_ROOTFS_RPM}${rpmlibdir}/DB_CONFIG << EOF
65# ================ Environment 68# ================ Environment
66set_data_dir . 69set_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 @@
1Upstream-Status: Inappropriate [configuration]
2
3Change cache size to reduce the usage of disk space from 62MB to 26MB.
4
5Signed-off-by: Mei Lei <lei.mei@intel.com>
6
7diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in
8index e0b4689..b64e3a9 100644
9--- a/rpmdb/DB_CONFIG.in
10+++ b/rpmdb/DB_CONFIG.in
11@@ -29,7 +29,7 @@ set_thread_count 64
12
13 # ================ Memory Pool
14 #XXX initializing dbenv with set_cachesize has unimplemented prerequsites
15-#set_cachesize 0 1048576 0
16+set_cachesize 0 1048576 0
17 set_mp_mmapsize 268435456
18
19 # ================ 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"
45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" 45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
46extrarpmdeps = "python perl" 46extrarpmdeps = "python perl"
47extrarpmdeps_virtclass-native = "file-native" 47extrarpmdeps_virtclass-native = "file-native"
48PR = "r27" 48PR = "r28"
49 49
50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
51# in order to extract the distribution SRPM into a format we can extract... 51# in order to extract the distribution SRPM into a format we can extract...
52SRC_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 \ 52SRC_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 \
53 file://rpm-log-auto-rm.patch \ 53 file://rpm-log-auto-rm.patch \
54 file://rpm-db-reduce.patch \
54 file://perfile_rpmdeps.sh \ 55 file://perfile_rpmdeps.sh \
55 file://rpm-autogen.patch \ 56 file://rpm-autogen.patch \
56 file://rpm-libsql-fix.patch \ 57 file://rpm-libsql-fix.patch \