diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 3 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 1 | ||||
-rw-r--r-- | meta/conf/documentation.conf | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index cb3ceacbcb..b29d3edb2f 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -359,6 +359,9 @@ EOF | |||
359 | smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-extra-macros._tmppath=/install/tmp | 359 | smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-extra-macros._tmppath=/install/tmp |
360 | package_write_smart_config ${target_rootfs} | 360 | package_write_smart_config ${target_rootfs} |
361 | # Do the following configurations here, to avoid them being saved for field upgrade | 361 | # Do the following configurations here, to avoid them being saved for field upgrade |
362 | if [ "x${NO_RECOMMENDATIONS}" = "x1" ]; then | ||
363 | smart --data-dir=$1/var/lib/smart config --set ignore-all-recommends=1 | ||
364 | fi | ||
362 | for i in ${PACKAGE_EXCLUDE}; do | 365 | for i in ${PACKAGE_EXCLUDE}; do |
363 | smart --data-dir=$1/var/lib/smart flag --set exclude-packages $i | 366 | smart --data-dir=$1/var/lib/smart flag --set exclude-packages $i |
364 | done | 367 | done |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 07eb473190..43acc077b8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -753,6 +753,7 @@ COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" | |||
753 | SERIAL_CONSOLE ??= "" | 753 | SERIAL_CONSOLE ??= "" |
754 | SERIAL_CONSOLES ??= "${@d.getVar('SERIAL_CONSOLE', True).replace(' ', ';')}" | 754 | SERIAL_CONSOLES ??= "${@d.getVar('SERIAL_CONSOLE', True).replace(' ', ';')}" |
755 | 755 | ||
756 | NO_RECOMMENDATIONS ?= "" | ||
756 | BAD_RECOMMENDATIONS ?= "" | 757 | BAD_RECOMMENDATIONS ?= "" |
757 | 758 | ||
758 | # Make sure MACHINE isn't exported | 759 | # Make sure MACHINE isn't exported |
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index b930611c8b..e83981cc51 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
@@ -114,6 +114,9 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the | |||
114 | IPK_FEED_URIS[doc] = "List of ipkg feed records to put into generated image." | 114 | IPK_FEED_URIS[doc] = "List of ipkg feed records to put into generated image." |
115 | FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image." | 115 | FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image." |
116 | 116 | ||
117 | BAD_RECOMMENDATIONS[doc] = "List of packages to not install if recommended. These will still be installed if required." | ||
118 | NO_RECOMMENDATIONS[doc] = "When set to 1, no recommended packages will be installed. Note: some recommended packages may be required for certain system functionality, such as kernel-modules. It is up to the user to add packages to IMAGE_INSTALL as needed." | ||
119 | |||
117 | IMAGE_INSTALL[doc] = "Used by an image recipe to list the packages to be installed. See PACKAGE_INSTALL." | 120 | IMAGE_INSTALL[doc] = "Used by an image recipe to list the packages to be installed. See PACKAGE_INSTALL." |
118 | 121 | ||
119 | PACKAGE_EXCLUDE[doc] = "Packages to exclude from the installation, if required an error will be generated." | 122 | PACKAGE_EXCLUDE[doc] = "Packages to exclude from the installation, if required an error will be generated." |