Changeset 3176 in /cluster/svnroot


Ignore:
Timestamp:
May 10, 2011 7:28:22 PM (10 years ago)
Author:
skylar
Message:

dpkg --root breaks if architecture is different from host (#457,​629)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar-devel/bin/build_livecd.pl

    r3175 r3176  
    4848my($debmirror,$websvn,$rc,$out,$ft,$tmpdir,$cwd,$svnrev,
    4949   $Bccd,$allout,$rpkgs,$nouid,$nogid,$debmirror_host,
    50    $debmirror_name,$debsecmirror,$dir);
     50   $debmirror_name,$debsecmirror,$dir,$kern_deb);
    5151my(@lsof,@pids,@rd);
    5252
     
    549549        "/usr/sbin/chroot $BUILDDIR ln -s /usr/lib32/libstdc++.so.6 /usr/lib32/libstdc++.so",
    550550        );
    551         $Bccd->run_test(
    552                 "system",
    553                 "",
    554                 "Installing new kernel.",
    555                 "/usr/bin/dpkg -i /root/linux-image-2.6.38bccd_2.6.38bccd-10.00.Custom_amd64.deb --root $BUILDDIR",
    556                 );
     551    $kern_deb = 'linux-image-2.6.38bccd_2.6.38bccd-10.00.Custom_amd64.deb';
    557552}
    558553else {
    559         $Bccd->run_test(
    560                 "system",
    561                 "",
    562                 "Installing new kernel.",
    563                 "/usr/bin/dpkg -i /root/linux-image-2.6.38bccd_2.6.38bccd-10.00.Custom_i386.deb --root $BUILDDIR",
    564                 );
    565 }
     554    $kern_deb = 'linux-image-2.6.38bccd_2.6.38bccd-10.00.Custom_i386.deb';
     555}
     556
     557$Bccd->run_test(
     558    "fcopy",
     559    "",
     560    "/root/$KERN_DEB",
     561    "$BUILDDIR/tmp/$kern_deb",
     562    );
     563
     564$Bccd->run_test(
     565    "system",
     566    "",
     567    "Installing new kernel.",
     568    "/usr/bin/chroot $BUILDDIR /usr/bin/dpkg -i /tmp/$kern_deb",
     569    );
     570
     571$Bccd->run_test(
     572    "unlink",
     573    "",
     574    "Removing kernel deb file.",
     575    "$kern_deb",
     576    );
    566577
    567578# Workaround for tftpd-hpa/inetd conflict
Note: See TracChangeset for help on using the changeset viewer.