Revert "[build] Add cb(pre)ignore capabilities to build. Removes dependencies from...

preinstalls without installs make no sense.

This reverts commit 2507f55cadf50a5d77f183361ab0ee94f44c110d.

diff --git a/Build.pm b/Build.pm
index e57b4d8..3cfa5e5 100644 (file)
--- a/Build.pm
+++ b/Build.pm
@@ -209,7 +209,7 @@ sub read_config {
       }
       next;
     }
-    if ($l0 eq 'preinstall:' || $l0 eq 'vminstall:' || $l0 eq 'cbpreinstall:' || $l0 eq 'cbinstall:' || $l0 eq 'cbpreignore:' || $l0 eq 'cbignore:' || $l0 eq 'required:' || $l0 eq 'support:' || $l0 eq 'keep:' || $l0 eq 'prefer:' || $l0 eq 'ignore:' || $l0 eq 'conflict:' || $l0 eq 'runscripts:') {
+    if ($l0 eq 'preinstall:' || $l0 eq 'vminstall:' || $l0 eq 'cbpreinstall:' || $l0 eq 'cbinstall:' || $l0 eq 'required:' || $l0 eq 'support:' || $l0 eq 'keep:' || $l0 eq 'prefer:' || $l0 eq 'ignore:' || $l0 eq 'conflict:' || $l0 eq 'runscripts:') {
       my $t = substr($l0, 0, -1);
       for my $l (@l) {
        if ($l eq '!*') {
@@ -276,7 +276,7 @@ sub read_config {
       warn("unknown keyword in config: $l0\n");
     }
   }
-  for my $l (qw{preinstall vminstall cbpreinstall cbinstall cbpreignore cbignore required support keep runscripts repotype patterntype}) {
+  for my $l (qw{preinstall vminstall cbpreinstall cbinstall required support keep runscripts repotype patterntype}) {
     $config->{$l} = [ unify(@{$config->{$l}}) ];
   }
   for my $l (keys %{$config->{'substitute'}}) {
@@ -417,16 +417,6 @@ sub get_cbinstalls {
   return @{$config->{'cbinstall'}};
 }
 
-sub get_cbpreignores {
-  my ($config) = @_;
-  return @{$config->{'cbpreignore'}};
-}
-
-sub get_cbignores {
-  my ($config) = @_;
-  return @{$config->{'cbignore'}};
-}
-
 sub get_runscripts {
   my ($config) = @_;
   return @{$config->{'runscripts'}};

diff --git a/expanddeps b/expanddeps
index 5b1882b..f2929c1 100755 (executable)
--- a/expanddeps
+++ b/expanddeps
@@ -171,8 +171,6 @@ sub print_rpmlist
   print "vminstall: @{$cf->{'vminstall'} || []}\n";
   print "cbpreinstall: @{$cf->{'cbpreinstall'} || []}\n"; # preinstall if is_emulator_arch
   print "cbinstall: @{$cf->{'cbinstall'} || []}\n";       # install if is_emulator_arch
-  print "cbpreignore: @{$cf->{'cbpreignore'} || []}\n"  # ignore in preinstall section if is_emulator_arch
-  print "cbignore: @{$cf->{'cbignore'} || []}\n";       # ignore in install section if is_emulator_arch
   print "runscripts: @{$cf->{'runscripts'} || []}\n";
   print "dist: $dist\n" if defined $dist;
 }

diff --git a/init_buildsystem b/init_buildsystem
index d4cea02..b1de006 100755 (executable)
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -548,8 +548,6 @@ else
     PACKAGES_TO_VMINSTALL=
     PACKAGES_TO_CBPREINSTALL=
     PACKAGES_TO_CBINSTALL=
-    PACKAGES_TO_CBPREIGNORE=
-    PACKAGES_TO_CBIGNORE=
     RUNSCRIPTS_SEEN=
     GUESSED_DIST=unknown
     mkdir -p $BUILD_ROOT/.init_b_cache/rpms
@@ -576,18 +574,6 @@ else
            fi
            continue
        fi
-       if test "$PKG" = "cbignore:" ; then
-           if is_emulator_arch ; then
-               PACKAGES_TO_CBIGNORE=$SRC
-           fi
-           continue
-       fi
-       if test "$PKG" = "cbpreignore:" ; then
-           if is_emulator_arch ; then
-               PACKAGES_TO_CBPREIGNORE=$SRC
-           fi
-           continue
-       fi
        if test "$PKG" = "runscripts:" ; then
            RUNSCRIPTS_SEEN=true
            PACKAGES_TO_RUNSCRIPTS=$SRC
@@ -624,9 +610,6 @@ else
 
     test -n "$PACKAGES_TO_CBPREINSTALL" && echo "cbpreinstall: $PACKAGES_TO_CBPREINSTALL"
     test -n "$PACKAGES_TO_CBINSTALL" && echo "cbinstall   : $PACKAGES_TO_CBINSTALL"
-    test -n "$PACKAGES_TO_CBPREIGNORE" && echo "cbpreignore: $PACKAGES_TO_CBPREIGNORE"
-    test -n "$PACKAGES_TO_CBIGNORE" && echo "cbignore: $PACKAGES_TO_CBIGNORE"
-
     # compatibility...
     test -z "$RUNSCRIPTS_SEEN" && PACKAGES_TO_RUNSCRIPTS="$PACKAGES_TO_PREINSTALL"
 
@@ -655,14 +638,6 @@ if test ! -f $BUILD_ROOT/var/lib/rpm/packages.rpm -a ! -f $BUILD_ROOT/var/lib/rp
        :> $BUILD_ROOT/etc/ld.so.conf
        :> $BUILD_ROOT/etc/default/rcS
     fi
-    # remove CBPREIGNORE 
-    if test -n "$PACKAGES_TO_CBPREIGNORE"; then
-        for preignore in $PACKAGES_TO_CBPREIGNORE; do
-          ${PACKAGES_TO_RUNSCRIPTS#preignore}
-          ${PACKAGES_TO_PREINSTALL#preignore}
-          echo "Removing $preignore from runscripts and preinstall (cbpreignore)."
-        done
-    fi
     for PKG in $PACKAGES_TO_RUNSCRIPTS ; do
        : > $BUILD_ROOT/.init_b_cache/scripts/$PKG.run
     done
@@ -701,13 +676,6 @@ if test -n "$PREPARE_VM" ; then
     done
     # alreadyinstalled check will not work, but we have to live with
     # that...
-    # remove CBPREIGNORE 
-    if test -n "$PACKAGES_TO_CBIGNORE"; then
-        for ignore in $PACKAGES_TO_CBIGNORE; do
-          ${PACKAGES_TO_INSTALL#ignore}
-          echo "Removing $ignore from install (cbignore)."
-        done
-    fi
     echo -n 'reordering...'
     PACKAGES_TO_INSTALL=`reorder $PACKAGES_TO_INSTALL`
     echo 'done'
@@ -757,15 +725,8 @@ fi
 # reorder packages (already done in vm continuation)
 #
 if ! test -e $BUILD_ROOT/.build/init_buildsystem.data ; then
-    # remove CBIGNORE 
-    if test -n "$PACKAGES_TO_CBIGNORE"; then
-        for ignore in $PACKAGES_TO_CBIGNORE; do
-          ${PACKAGES_TO_INSTALL#ignore}
-          echo "Removing $ignore from install (cbignore)."
-        done
-    fi
     echo -n 'reordering...'
-    # unused ? PACKAGES_TO_INSTALL_FIRST=`reorder $PACKAGES_TO_INSTALL_FIRST`
+    PACKAGES_TO_INSTALL_FIRST=`reorder $PACKAGES_TO_INSTALL_FIRST`
     PACKAGES_TO_INSTALL=`reorder $PACKAGES_TO_INSTALL`
     echo 'done'
 fi
@@ -797,8 +758,7 @@ for PKG in $BUILD_ROOT/.init_b_cache/alreadyinstalled/* ; do
     test "$PKG" = "*" && continue
     ln $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG $BUILD_ROOT/.init_b_cache/todelete/$PKG
 done
-# unused ? $PACKAGES_TO_INSTALL_FIRST
-for PKG in $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL ; do
+for PKG in $PACKAGES_TO_INSTALL_FIRST $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL ; do
     rm -f $BUILD_ROOT/.init_b_cache/todelete/$PKG
 done
 for PKG in $BUILD_ROOT/.init_b_cache/todelete/* ; do
@@ -825,8 +785,8 @@ RPMCHECKOPTS_HOST=
 # detect rpm4
 test -x $BUILD_ROOT/usr/bin/rpmsign && RPMCHECKOPTS="--nodigest --nosignature"
 test -x /usr/bin/rpmsign && RPMCHECKOPTS_HOST="--nodigest --nosignature"
-#$PACKAGES_TO_INSTALL_FIRST 
-for PKG in RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL; do
+
+for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL; do
 
     case $PKG in
       RUN_LDCONFIG)