summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-11 18:18:57 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 10:10:35 (GMT)
commit43dd3512aa54dec946f619f4c18e5dc0a4162301 (patch)
tree39cda5b0fe15ef420c2e24acfbb37047e5e7ff24
parent7fe15f02b52cc27078e014933f6d1b5bbde44fb4 (diff)
downloadpoky-43dd3512aa54dec946f619f4c18e5dc0a4162301.tar.gz
rootfs_rpm.bbclass: Update database configuration file
Move the creation of the database configuration files to just before we perform the install actions. This ensures they will exist even in SDK or other non-target filesystem images. (From OE-Core rev: 113e015afd46e46c9ba0413ca15f0316fa2eec24) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_rpm.bbclass32
-rw-r--r--meta/classes/rootfs_rpm.bbclass31
2 files changed, 32 insertions, 31 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 097fa12..b84c044 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -454,6 +454,38 @@ EOF
454 454
455 chmod 0755 ${WORKDIR}/scriptlet_wrapper 455 chmod 0755 ${WORKDIR}/scriptlet_wrapper
456 456
457 # Configure RPM... we enforce these settings!
458 mkdir -p ${target_rootfs}${rpmlibdir}
459 mkdir -p ${target_rootfs}${rpmlibdir}/log
460 # After change the __db.* cache size, log file will not be generated automatically,
461 # that will raise some warnings, so touch a bare log for rpm write into it.
462 touch ${target_rootfs}${rpmlibdir}/log/log.0000000001
463 cat > ${target_rootfs}${rpmlibdir}/DB_CONFIG << EOF
464# ================ Environment
465set_data_dir .
466set_create_dir .
467set_lg_dir ./log
468set_tmp_dir ./tmp
469set_flags db_log_autoremove on
470
471# -- thread_count must be >= 8
472set_thread_count 64
473
474# ================ Logging
475
476# ================ Memory Pool
477set_cachesize 0 1048576 0
478set_mp_mmapsize 268435456
479
480# ================ Locking
481set_lk_max_locks 16384
482set_lk_max_lockers 16384
483set_lk_max_objects 16384
484mutex_set_max 163840
485
486# ================ Replication
487EOF
488
457 # RPM is special. It can't handle dependencies and preinstall scripts correctly. Its 489 # RPM is special. It can't handle dependencies and preinstall scripts correctly. Its
458 # probably a feature. The only way to convince rpm to actually run the preinstall scripts 490 # probably a feature. The only way to convince rpm to actually run the preinstall scripts
459 # for base-passwd and shadow first before installing packages that depend on these packages 491 # for base-passwd and shadow first before installing packages that depend on these packages
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index eafb34b..202f9ce 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -59,37 +59,6 @@ fakeroot rootfs_rpm_do_rootfs () {
59 # Setup base system configuration 59 # Setup base system configuration
60 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/ 60 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
61 61
62 mkdir -p ${INSTALL_ROOTFS_RPM}${rpmlibdir}
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
67 cat > ${INSTALL_ROOTFS_RPM}${rpmlibdir}/DB_CONFIG << EOF
68# ================ Environment
69set_data_dir .
70set_create_dir .
71set_lg_dir ./log
72set_tmp_dir ./tmp
73set_flags db_log_autoremove on
74
75# -- thread_count must be >= 8
76set_thread_count 64
77
78# ================ Logging
79
80# ================ Memory Pool
81set_cachesize 0 1048576 0
82set_mp_mmapsize 268435456
83
84# ================ Locking
85set_lk_max_locks 16384
86set_lk_max_lockers 16384
87set_lk_max_objects 16384
88mutex_set_max 163840
89
90# ================ Replication
91EOF
92
93 # List must be prefered to least preferred order 62 # List must be prefered to least preferred order
94 INSTALL_PLATFORM_EXTRA_RPM="" 63 INSTALL_PLATFORM_EXTRA_RPM=""
95 for each_arch in ${MULTILIB_PACKAGE_ARCHS} ${PACKAGE_ARCHS}; do 64 for each_arch in ${MULTILIB_PACKAGE_ARCHS} ${PACKAGE_ARCHS}; do