Skip to content
Browse files

Say goodbye to 32 bit builds. We've threatened that 9.2.1[.x] would be

the last 32 bit FreeNAS, and these commits now make it so.  Good riddance!
  • Loading branch information...
1 parent 06e3463 commit 54cfdcf7ec76fc83f1c7d2dff47cd651f48a04b2 @jordanhubbard jordanhubbard committed Mar 3, 2014
Showing with 14 additions and 19 deletions.
  1. +2 −2 README
  2. +1 −1 build/README
  3. +2 −3 build/build_release.sh
  4. +9 −13 build/create_release_distribution.sh
View
4 README
@@ -5,8 +5,8 @@ Requirements:
- Your build environment must be FreeBSD 9.2-RELEASE (building on
FreeBSD 10 or 11 is not supported at this time).
-- amd64 or i386 for i386 builds; an amd64 for amd64 builds. 8GB of
- memory, or an equal/greater amount of swap space, is also required
+- an amd64 capable processor. 8GB of memory, or an equal/greater amount
+ of swap space, is also required
- You will need the following ports/packages when compiling anything
FreeNAS-related:
View
2 build/README
@@ -1,4 +1,4 @@
-These are the i386 and x64 distributions for FreeNAS VERSION
+This is an x64 distribution for FreeNAS VERSION
built on BUILD_TIMESTAMP (yyyymmdd format).
If you are seeing this README file, this is a daily build created for
View
5 build/build_release.sh
@@ -9,7 +9,6 @@ set -e
mydir=`dirname $0`
-( sh $mydir/do_build.sh -z; sh $mydir/do_build.sh -a ) &
-( env FREENAS_ARCH=i386 sh $mydir/do_build.sh -z; env FREENAS_ARCH=i386 sh $mydir/do_build.sh -a ) &
-wait
+sh $mydir/do_build.sh -z
+sh $mydir/do_build.sh -a
sh $mydir/create_release_distribution.sh
View
22 build/create_release_distribution.sh
@@ -10,23 +10,19 @@ TOP="$(pwd)"
. build/nano_env
. build/functions.sh
-map_x86=i386
-map_x64=amd64
-
TARBALL="${TOP}/${NANO_LABEL}-${VERSION}-${BUILD_TIMESTAMP}.tar"
STAGEDIR="${NANO_LABEL}-${VERSION}-${BUILD_TIMESTAMP}"
rm -rf "${TOP}/${STAGEDIR}"
set -x
set -e
mkdir -p "${TOP}/${STAGEDIR}"
-for arch in x64 x86 ; do
- eval mapped_arch=\$map_$arch
- echo $arch = $mapped_arch
- mkdir -p ${TOP}/${STAGEDIR}/${arch}
- for ext in img.xz GUI_Upgrade.txz iso vmdk.xz ; do
- if [ -f ${TOP}/os-base/$mapped_arch/${NANO_NAME%-*}-${arch}.${ext} ]; then
- ln ${TOP}/os-base/$mapped_arch/${NANO_NAME%-*}-${arch}.${ext} ${TOP}/${STAGEDIR}/${arch}
- ln ${TOP}/os-base/$mapped_arch/${NANO_NAME%-*}-${arch}.${ext}.sha256.txt ${TOP}/${STAGEDIR}/${arch}
- fi
- done
+
+arch=x64
+mapped_arch=amd64
+mkdir -p ${TOP}/${STAGEDIR}/${arch}
+for ext in img.xz GUI_Upgrade.txz iso vmdk.xz ; do
+ if [ -f ${TOP}/os-base/$mapped_arch/${NANO_NAME%-*}-${arch}.${ext} ]; then
+ ln ${TOP}/os-base/$mapped_arch/${NANO_NAME%-*}-${arch}.${ext} ${TOP}/${STAGEDIR}/${arch}
+ ln ${TOP}/os-base/$mapped_arch/${NANO_NAME%-*}-${arch}.${ext}.sha256.txt ${TOP}/${STAGEDIR}/${arch}
+ fi
done

0 comments on commit 54cfdcf

Please sign in to comment.
Something went wrong with that request. Please try again.