diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-20 20:38:11 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-20 20:38:11 +0000 |
commit | 1e40bc8272df4774cde8f1a9d8561624eb6ae930 (patch) | |
tree | 16d68b51decf37a121507812ac92bea4f1eb64b0 /meta/classes | |
parent | 0fb111b7eaf8e32940ab65f67bb821904af2da36 (diff) | |
download | poky-1e40bc8272df4774cde8f1a9d8561624eb6ae930.tar.gz |
rootfs_rpm: Add --ignoresize option when performing DB operations on a rootfs
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 6e9cbba8c2..33abe96df9 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -80,7 +80,7 @@ fakeroot rootfs_rpm_do_rootfs () { | |||
80 | # an actual package install! | 80 | # an actual package install! |
81 | ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \ | 81 | ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \ |
82 | -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync" \ | 82 | -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync" \ |
83 | -U --justdb --noscripts --notriggers --noparentdirs --nolinktos \ | 83 | -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \ |
84 | ${IMAGE_ROOTFS}/install/install.manifest | 84 | ${IMAGE_ROOTFS}/install/install.manifest |
85 | 85 | ||
86 | if [ ! -z "${PACKAGE_INSTALL_ATTEMPTONLY}" ]; then | 86 | if [ ! -z "${PACKAGE_INSTALL_ATTEMPTONLY}" ]; then |
@@ -95,7 +95,7 @@ fakeroot rootfs_rpm_do_rootfs () { | |||
95 | echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_rootfs_attemptonly.${PID}" | 95 | echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_rootfs_attemptonly.${PID}" |
96 | ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \ | 96 | ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \ |
97 | -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync private" \ | 97 | -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync private" \ |
98 | -U --justdb --noscripts --notriggers --noparentdirs --nolinktos \ | 98 | -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \ |
99 | $pkg_name >> "${WORKDIR}/temp/log.do_rootfs_attemptonly.${PID}" || true | 99 | $pkg_name >> "${WORKDIR}/temp/log.do_rootfs_attemptonly.${PID}" || true |
100 | done | 100 | done |
101 | fi | 101 | fi |
@@ -130,7 +130,7 @@ fakeroot rootfs_rpm_do_rootfs () { | |||
130 | echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_rootfs_recommend.${PID}" | 130 | echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_rootfs_recommend.${PID}" |
131 | ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \ | 131 | ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \ |
132 | -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync private" \ | 132 | -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync private" \ |
133 | -U --justdb --noscripts --notriggers --noparentdirs --nolinktos \ | 133 | -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \ |
134 | $pkg_name >> "${WORKDIR}/temp/log.do_rootfs_recommend.${PID}" 2>&1 || true | 134 | $pkg_name >> "${WORKDIR}/temp/log.do_rootfs_recommend.${PID}" 2>&1 || true |
135 | done | 135 | done |
136 | cat ${IMAGE_ROOTFS}/install/recommend.list ${IMAGE_ROOTFS}/install/recommend.new | sort -u > ${IMAGE_ROOTFS}/install/recommend.new.list | 136 | cat ${IMAGE_ROOTFS}/install/recommend.list ${IMAGE_ROOTFS}/install/recommend.new | sort -u > ${IMAGE_ROOTFS}/install/recommend.new.list |