Simplify the code for splitting the monolithic packages file.

This commit is contained in:
Richard W.M. Jones 2014-05-16 22:15:30 +01:00
parent 6ede7de3df
commit 6234674c9c

View File

@ -871,23 +871,25 @@ gzip --best installed-docs/*.xml
# Split up the monolithic packages file in the supermin appliance so # Split up the monolithic packages file in the supermin appliance so
# we can install dependencies in subpackages. # we can install dependencies in subpackages.
pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d
grep -Ev '^(gfs2-utils|hfsplus-tools|jfsutils|nilfs-utils|reiserfs-utils|iputils|lsof|openssh-clients|strace|vim-minimal|rsync|xfsprogs|zfs-fuse)$' < packages > packages.new function move_to
mv packages.new packages {
echo gfs2-utils > zz-packages-gfs2 grep -Ev "^$1$" < packages > packages-t
echo hfsplus-tools > zz-packages-hfsplus mv packages-t packages
echo jfsutils > zz-packages-jfs echo "$1" >> "$2"
echo nilfs-utils > zz-packages-nilfs }
echo reiserfs-utils > zz-packages-reiserfs move_to gfs2-utils zz-packages-gfs2
cat <<EOF > zz-packages-rescue move_to hfsplus-tools zz-packages-hfsplus
iputils move_to jfsutils zz-packages-jfs
lsof move_to nilfs-utils zz-packages-nilfs
openssh-clients move_to reiserfs-utils zz-packages-reiserfs
strace move_to iputils zz-packages-rescue
vim-minimal move_to lsof zz-packages-rescue
EOF move_to openssh-clients zz-packages-rescue
echo rsync > zz-packages-rsync move_to strace zz-packages-rescue
echo xfsprogs > zz-packages-xfs move_to vim-minimal zz-packages-rescue
echo zfs-fuse > zz-packages-zfs move_to rsync zz-packages-rsync
move_to xfsprogs zz-packages-xfs
move_to zfs-fuse zz-packages-zfs
popd popd
# For the libguestfs-live-service subpackage install the systemd # For the libguestfs-live-service subpackage install the systemd