diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-20 09:29:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-20 09:29:20 +0000 |
| commit | bf021b653f01f5c96f8e3104b85c8d679a54b899 (patch) | |
| tree | 4deb30a10fd5f232726f707bd3cd4bb8c2d5cbce | |
| parent | 793920a5672c9076c182b01c98419dd8b206f6da (diff) | |
| parent | d053f9d781d43bf90d3fca106bd42bc6f52ccb81 (diff) | |
| download | ironic-python-agent-bf021b653f01f5c96f8e3104b85c8d679a54b899.tar.gz | |
Merge "Use TinyCore Linux 7.x for TinyIPA" into stable/mitaka
| -rwxr-xr-x | imagebuild/tinyipa/build-tinyipa.sh | 10 | ||||
| -rw-r--r-- | imagebuild/tinyipa/build_files/buildreqs.lst | 4 | ||||
| -rwxr-xr-x | imagebuild/tinyipa/build_files/fakeuname | 2 | ||||
| -rw-r--r-- | imagebuild/tinyipa/build_files/finalreqs.lst | 5 |
4 files changed, 12 insertions, 9 deletions
diff --git a/imagebuild/tinyipa/build-tinyipa.sh b/imagebuild/tinyipa/build-tinyipa.sh index b3e8c45a..cf48c6f3 100755 --- a/imagebuild/tinyipa/build-tinyipa.sh +++ b/imagebuild/tinyipa/build-tinyipa.sh @@ -27,8 +27,8 @@ fi ############################################## cd $WORKDIR/build_files -wget -N http://distro.ibiblio.org/tinycorelinux/6.x/x86_64/release/distribution_files/corepure64.gz -wget -N http://distro.ibiblio.org/tinycorelinux/6.x/x86_64/release/distribution_files/vmlinuz64 +wget -N http://distro.ibiblio.org/tinycorelinux/7.x/x86_64/release/distribution_files/corepure64.gz +wget -N http://distro.ibiblio.org/tinycorelinux/7.x/x86_64/release/distribution_files/vmlinuz64 cd $WORKDIR ######################################################## @@ -59,7 +59,11 @@ cp requirements.txt $BUILDDIR/tmp/ipa-requirements.txt cd $WORKDIR sudo cp /etc/resolv.conf $BUILDDIR/etc/resolv.conf + +trap "sudo umount $BUILDDIR/proc; sudo umount $BUILDDIR/dev/pts" EXIT sudo mount --bind /proc $BUILDDIR/proc +sudo mount --bind /dev/pts $BUILDDIR/dev/pts + $CHROOT_CMD mkdir /etc/sysconfig/tcedir $CHROOT_CMD chmod a+rwx /etc/sysconfig/tcedir $CHROOT_CMD touch /etc/sysconfig/tcuser @@ -72,8 +76,6 @@ while read line; do sudo chroot --userspec=$TC:$STAFF $BUILDDIR /usr/bin/env -i PATH=$CHROOT_PATH http_proxy=$http_proxy https_proxy=$https_proxy no_proxy=$no_proxy tce-load -wci $line done < $WORKDIR/build_files/buildreqs.lst -sudo umount $BUILDDIR/proc - # Build python wheels $CHROOT_CMD python /tmp/get-pip.py $CHROOT_CMD pip install pbr diff --git a/imagebuild/tinyipa/build_files/buildreqs.lst b/imagebuild/tinyipa/build_files/buildreqs.lst index eabd129c..2b5c216d 100644 --- a/imagebuild/tinyipa/build_files/buildreqs.lst +++ b/imagebuild/tinyipa/build_files/buildreqs.lst @@ -7,8 +7,8 @@ hdparm.tcz parted.tcz python.tcz python-dev.tcz -raid-dm-3.16.6-tinycore64.tcz -scsi-3.16.6-tinycore64.tcz +raid-dm-4.2.9-tinycore64.tcz +scsi-4.2.9-tinycore64.tcz udev-lib.tcz util-linux.tcz pkg-config.tcz diff --git a/imagebuild/tinyipa/build_files/fakeuname b/imagebuild/tinyipa/build_files/fakeuname index a6e31fdd..28cf1f2c 100755 --- a/imagebuild/tinyipa/build_files/fakeuname +++ b/imagebuild/tinyipa/build_files/fakeuname @@ -1,7 +1,7 @@ #!/bin/sh S="Linux" N="box" -R="3.16.6-tinycore64" +R="4.2.9-tinycore64" P="unknown" V="#777 SMP (2016-02-29)" M="x86_64" diff --git a/imagebuild/tinyipa/build_files/finalreqs.lst b/imagebuild/tinyipa/build_files/finalreqs.lst index 677bd084..70da07c8 100644 --- a/imagebuild/tinyipa/build_files/finalreqs.lst +++ b/imagebuild/tinyipa/build_files/finalreqs.lst @@ -5,9 +5,10 @@ gdisk.tcz hdparm.tcz iproute2.tcz parted.tcz +popt.tcz python.tcz -raid-dm-3.16.6-tinycore64.tcz -scsi-3.16.6-tinycore64.tcz +raid-dm-4.2.9-tinycore64.tcz +scsi-4.2.9-tinycore64.tcz udev-lib.tcz util-linux.tcz glib2.tcz |