diff options
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 1cc4a84495..c9258dfe39 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -143,40 +143,15 @@ RPM_QUERY_CMD = '${RPM} --root $INSTALL_ROOTFS_RPM -D "_dbpath ${rpmlibdir}" \ | |||
143 | list_installed_packages() { | 143 | list_installed_packages() { |
144 | if [ "$1" = "arch" ] ; then | 144 | if [ "$1" = "arch" ] ; then |
145 | ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | 145 | ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" |
146 | elif [ "$1" = "file" ] ; then | ||
147 | ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{PACKAGEORIGIN}\n]" | ||
146 | else | 148 | else |
147 | ${RPM_QUERY_CMD} -qa --qf "[%{NAME}\n]" | 149 | ${RPM_QUERY_CMD} -qa --qf "[%{NAME}\n]" |
148 | fi | 150 | fi |
149 | } | 151 | } |
150 | 152 | ||
151 | get_package_filename() { | 153 | rootfs_list_installed_depends() { |
152 | resolve_package_rpm ${RPMCONF_TARGET_BASE}-base_archs.conf $1 | 154 | rpmresolve -d $INSTALL_ROOTFS_RPM/${rpmlibdir} |
153 | } | ||
154 | |||
155 | list_package_depends() { | ||
156 | pkglist=`list_installed_packages` | ||
157 | |||
158 | # REQUIRE* lists "soft" requirements (which we know as recommends and RPM refers to | ||
159 | # as "suggests") so filter these out with the help of awk | ||
160 | for req in `${RPM_QUERY_CMD} -q --qf "[%{REQUIRENAME} %{REQUIREFLAGS}\n]" $1 | awk '{ if( and($2, 0x80000) == 0) print $1 }'`; do | ||
161 | if echo "$req" | grep -q "^rpmlib" ; then continue ; fi | ||
162 | |||
163 | realpkg="" | ||
164 | for dep in $pkglist; do | ||
165 | if [ "$dep" = "$req" ] ; then | ||
166 | realpkg="1" | ||
167 | echo $req | ||
168 | break | ||
169 | fi | ||
170 | done | ||
171 | |||
172 | if [ "$realdep" = "" ] ; then | ||
173 | ${RPM_QUERY_CMD} -q --whatprovides $req --qf "%{NAME}\n" | ||
174 | fi | ||
175 | done | ||
176 | } | ||
177 | |||
178 | list_package_recommends() { | ||
179 | ${RPM_QUERY_CMD} -q --suggests $1 | ||
180 | } | 155 | } |
181 | 156 | ||
182 | rootfs_install_packages() { | 157 | rootfs_install_packages() { |