Commit Graph

41 Commits

Author SHA1 Message Date
Glen Barber
ace79aa796 Fix building BEAGLEBONE images with Crochet using the
sysutils/u-boot-beaglebone port:

 - In arm/BEAGLEBONE.conf, set EMBEDDEDPORTS to the
   sysutils/u-boot-beaglebone port.
 - In arm/release.sh, remove BEAGLEBONE from setting WANT_UBOOT
 - In tools/arm/crochet-BEAGLEBONE.conf, override the
   beaglebone_check_uboot(), and set BEAGLEBONE_UBOOT to
   /tmp/external/u-boot-beaglebone, and create symlinks to the
   u-boot files in /usr/local/share/u-boot-beaglebone and the
   uEnv.txt file in crochet/board/Beaglebone/files.

Sponsored by:	The FreeBSD Foundation
2015-05-05 21:08:50 +00:00
Glen Barber
86be889b61 Remove buildenv_setup(), and set EMBEDDEDPORTS to the
sysutils/u-boot-rpi2 port, since these cases are already
handled by arm/release.sh.

Sponsored by:	The FreeBSD Foundation
2015-05-05 16:37:59 +00:00
Glen Barber
20a67b0520 Add initial support for building RPI2 images.
In release.sh, allow overriding buildenv_setup() before
the handoff to arm/release.sh.

Copy arm/RPI-B.conf -> arm/RPI2.conf, set UBOOT_PORT and
the correct KERNEL, and add the buildenv_setup() override
to install the sysutils/u-boot-rpi2 port/package.

Copy tools/arm/crochet-RPI-B.conf -> tools/arm/crochet-RPI2.conf,
and set the correct entries for the RaspberryPi2 board.

Thanks to:	loos@
Sponsored by:	The FreeBSD Foundation
2015-05-05 16:28:04 +00:00
Glen Barber
a3d1b9c24a Fix CROCHETBRANCH, forgotten in r280640.
Submitted by:	ruben.kerkhof@gmail.com
PR:		199760
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-04-28 15:32:59 +00:00
Glen Barber
6fb3faab63 Crochet sources moved to a new home; update accordingly.
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-03-25 22:08:02 +00:00
Glen Barber
ff9b6b61e6 Properly evaluate XZ_CMD from the chroot.
Sponsored by:	The FreeBSD Foundation
2015-03-02 18:10:58 +00:00
Glen Barber
e37709dbab Use xz(1) to compress FreeBSD/arm images.
Sponsored by:	The FreeBSD Foundation
2015-03-02 18:04:57 +00:00
Ed Maste
04fef9c446 Build gperf before gcc
The ARM image builds build the in-tree gcc in order to build u-boot
and gperf is needed to build gcc, but is no longer installed on archs
that use clang.

Invoking the make targets as separate steps is done to work around
a build failure which is not yet fully understood.

Reviewed by:	gjb, imp
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D1317
2014-12-24 18:51:25 +00:00
Glen Barber
41ab81a556 Set a static revision of the Crochet checkout to avoid
surprise build failures.

MFC after:	3 days
X-10.1-MFC:	yes
X-MFC-With:	r271676, r271677
Sponsored by:	The FreeBSD Foundation
2014-09-16 15:35:13 +00:00
Glen Barber
094be940b6 Catch up with Crochet changes to fix the WANDBOARD-QUAD
build.

Tested on:	stable/10@r271618
MFC after:	3 days
X-10.1-MFC:	yes
X-MFC-With:	r271676
Sponsored by:	The FreeBSD Foundation
2014-09-16 15:31:50 +00:00
Glen Barber
98e600cc4a Catch up with Crochet changes to fix the BEAGLEBONE
build.

Tested on:	stable/10@r271618
MFC after:	3 days
X-10.1-MFC:	yes
Sponsored by:	The FreeBSD Foundation
2014-09-16 15:31:12 +00:00
Glen Barber
ce470233d4 Also export UNAME_r to fix arm builds.
MFC after:	3 days
X-MFC-with:	r270417
Sponsored by:	The FreeBSD Foundation
2014-08-23 16:15:16 +00:00
Glen Barber
f64f30c974 Fix arm build breakage when building stable/10 on
head/.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2014-08-23 15:59:31 +00:00
Glen Barber
2f40fb9ce2 In arm/release.sh, continue if 'xdev-links' target fails
where the target is not valid (stable/10), instead of doing
per-branch evaluation on if xdev-links needs to be invoked.

Sponsored by:	The FreeBSD Foundation
2014-08-11 16:31:28 +00:00
Glen Barber
95d901dba9 Merge the following from ^/projects/release-noxdev:
r269549, r269551, r269552, r269553, r269554, r269555, r269558, r269559,
r269560, r269561, r269628, r269629, r269630, r269635, r269637:

r269549:
  Create a new project branch, release-noxdev, for
  a sandbox workspace outside of head/ to update the
  release bits for arm builds since the deprecation of
  the XDEV and XDEV_ARCH make(1) variables.

r269551:
  Define load_chroot_env() and load_target_env()
  prototypes.

r269552:
  Call load_chroot_env() and load_target_env() where
  they can be mutually conflicting with regard to
  TARGET, TARGET_ARCH, XDEV, and XDEV_ARCH.

r269553:
  Add shebang line to arm/*.conf files since these
  should be considered to be executable (albeit not
  on their own) shell scripts.

r269554:
  Redefine load_chroot_env() and load_target_env() in
  the arm/*.conf files, and reindent.

r269555:
  Simplify where load_chroot_env() and load_target_env() are
  called.

r269558:
  Provide example in release.conf.sample for overriding the
  load_chroot_env() and load_target_env() prototypes.

r269559:
  Remove a gratuitous newline.

r269560:
  Unset potentially conflicting variables in load_chroot_env()
  and load_target_env().

r269561:
  Make global variables global, and accessible outside of
  the functions within which they were once defined.

r269628:
  Remove XDEV/XDEV_ARCH evaluation if EMBEDDEDBUILD is set.

r269629:
  In arm/release.sh, switch TARGET/TARGET_ARCH back to the
  original XDEV/XDEV_ARCH make(1) variables.

  In theory, this should have been a no-op, but the TARGET and
  TARGET_ARCH are now unset in load_target_env() to avoid
  collision with the chroot userland.

r269630:
  Export variables in the arm/*.conf files because they
  need to be passed through release.sh to arm/release.sh.

  Set MK_TESTS=no for the xdev target.

r269635:
  As part of the XDEV/XDEV_ARCH deprecation, the
  'xdev-links' target was intentionally no longer
  invoked automatically.

  Invoke the xdev-links target after xdev, which
  creates, for example, /usr/bin/armv6-freebsd-cc
  symlink to /usr/armv6-freebsd/usr/bin/cc.

r269637:
  Set TARGET and TARGET_ARCH to the XDEV and XDEV_ARCH
  counterparts for the xdev and xdev-links make(1)
  targets.

Sponsored by:	The FreeBSD Foundation
2014-08-06 19:04:05 +00:00
Glen Barber
9b4b426a62 Fake out the deprecation of XDEV and XDEV_ARCH by
continuing to use the variables in the configuration
file, but switch XDEV= and XDEV_ARCH= to TARGET= and
TARGET_ARCH= appropriately.

Sponsored by:	The FreeBSD Foundation
2014-07-23 22:35:23 +00:00
Glen Barber
13c36b4884 The u-boot tarball needed for some boards, BEAGLEBONE for
example, explicitly hard-code gcc(1) as the compiler.

Partially revert r264703, which did a post-chroot install
of gcc(1).  This was initially removed because gcc(1) fails
to build usr.bin/dtc/ causing the xdev target to fail.  So
this time, move the gcc(1) installation after xdev is built.

This change is likely applicable to stable/10 arm build
failures, as well.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2014-07-03 19:37:25 +00:00
Glen Barber
192daa5d18 Move xdev knobs from release/arm/release.sh and into an
XDEV_FLAGS variable in ${KERNCONF}.conf file.

MFC after:	3 days
X-MFC-Note:	fix stable/10 XDEV_FLAGS local for branch
Sponsored by:	The FreeBSD Foundation
2014-04-23 02:01:22 +00:00
Glen Barber
70ba1fc251 Play musical-KNOBS a bit more with release/arm/release.sh.
For stable/10, r264703 sets the correct WITH/WITHOUT
knobs to get xdev built with the arm-freebsd-gcc binary
installed.  Unfortunately, the same fix does not work on
head/.

Also, quite to my amazement, WITH_GCC=1 and WITH_GNUCXX=1
causes xdev to fail spectactularly at least on r264791.

The situation as it stands is:

 - gcc(1) is needed for the u-boot build.
 - cc(1) *cannot* be clang(1)

To shoe-horn the toolchain to make 'xdev' give what is
needed, remove WITH_GNUCXX=1 and add WITH_GCC_BOOTSTRAP=1.

MFC After:	1 week
X-MFC-To:	stable/10 only
X-MFC-Note:	after stable/10 is broken in this way...
Sponsored by:	The FreeBSD Foundation
2014-04-23 01:47:07 +00:00
Glen Barber
4f52dde357 Apply a slightly different color hammer to arm/release.sh:
- gcc(1) fails to build usr.bin/dtc
 - lack of WITH_GNUCXX=1 causes cc1plus(1) calls to fail
 - u-boot fails to build with clang (hard-coded gcc(1) calls)

Implement the proper incantation of WITH_/WITHOUT_ knobs
to get arm snapshot builds working again.

Since the cc(1) binary is no longer expected to be clang(1),
remove the chroot(8) post-install cc(1) overwrite.

MFC After:	3 days
X-MFC-With:	r264518,r264697,r264698
Tested on:	stable/10@r264677 RPI-B
Sponsored by:	The FreeBSD Foundation
2014-04-20 20:46:06 +00:00
Glen Barber
3654a9b190 Fix EOL escape.
MFC after:	3 days
X-MFC-With:	r264697
Sponsored by:	The FreeBSD Foundation
2014-04-20 16:34:10 +00:00
Glen Barber
2093b3b701 When building the 'xdev' target when WITH_GCC=1 and
WITHOUT_CLANG_IS_CC=1, it appears WITHOUT_CLANG=1 must
also be set.

While here, reorder the lines to put the WITH_* and
WITHOUT_* entries on the same line.

MFC After:	3 days
X-MFC-With:	r264518
Tested on:	stable/10@r264677
Sponsored by:	The FreeBSD Foundation
2014-04-20 16:33:28 +00:00
Glen Barber
f83d85861b Fix armv6 build failure: "armv6-freebsd-gcc: not found"
Help from:	imp
Sponsored by:	The FreeBSD Foundation
2014-04-15 23:27:14 +00:00
Glen Barber
67aa0eff2f Merge r262906 from ^/projects/release-embedded:
Remove only-works-on-amd64 restriction.

Sponsored by:	The FreeBSD Foundation
2014-04-04 07:42:12 +00:00
Glen Barber
fde4d9a822 Merge r262907 from ^/projects/release-embedded:
Add ZEDBOARD support for release builds.

Sponsored by:	The FreeBSD Foundation
2014-04-04 07:02:38 +00:00
Glen Barber
a193d6a320 Add ZEDBOARD.
Tested against:	stable/10@r262905 (build only)
Sponsored by:	The FreeBSD Foundation
2014-03-07 22:14:39 +00:00
Glen Barber
e7e17a891a Remove only-works-on-amd64 restriction.
Sponsored by:	The FreeBSD Foundation
2014-03-07 22:10:40 +00:00
Glen Barber
e0436612a9 Merge ^/projects/release-embedded into ^/head.
After several months of testing and fixing (and breaking)
various parts of release/release.sh changes, it is now
possible to build FreeBSD/arm images as part of the release
process.

When EMBEDDEDBUILD is set in the release.conf file, release.sh
will create the build environment, then run a separate script
in release/${XDEV}/release.sh [1].  Currently, only arm is
supported.

The release/${XDEV}/release.sh configures the build environment
specific for the target image, such as installing gcc(1),
installing additional third-party software from the ports tree,
and fetching external sources.

Once the build environment is set up, release/${XDEV}/release.sh
runs Crochet, written by Tim Kientzle, which builds the userland
and kernel, and creates an image that can be written to an SD
card with dd(1).  Many thanks to Tim for his work on Crochet.

Sample configurations for FreeBSD/arm boards are in the
release/arm/ directory, and Crochet configuration files for each
board are located in release/tools/arm/.  Supported boards at this
time are: BEAGLEBONE, PANDABOARD, RPI-B, and WANDBOARD-QUAD.

Adding support for additional boards will continue in the
projects/release-embedded/ branch, and incrementally merged back
to head/.

Many thanks to the FreeBSD Foundation for the support and
sponsorship of this project.

[1] XDEV is used in order to keep the various configurations
    organized by architecture, but since TARGET and TARGET_ARCH
    are used to build the chroot, the values of those variables
    cannot be used.

MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
2014-03-05 23:17:53 +00:00
Glen Barber
2175208978 Merge the following:
^/user/gjb/hacking/release-embedded:
	259994,260000,260895-260896,261139,261152,
	261174,261176,261210,261221,261237,261239,
	261448,261489
 ^/user/gjb/release-embedded:
	262305,262307

svn:mergeinfo is intentionally not included in the commit, so it does
not propagate to head/.

Sponsored by:	The FreeBSD Foundation
2014-02-21 23:18:35 +00:00
Glen Barber
d91104f02e Add configurations for WANDBOARD-QUAD images.
Tested against:	head@r261642 (build only)
Sponsored by:	The FreeBSD Foundation
2014-02-21 21:46:54 +00:00
Glen Barber
227c919124 Pass WORLD_FLAGS to the gcc and xdev builds.
Building gnu/usr.bin/cc/ with '-j' set blows up quite
impressively, so add '-j1' after WORLD_FLAGS, and add
a comment explaining why '-j1' is there.

Sponsored by:	The FreeBSD Foundation
2014-02-04 16:18:38 +00:00
Glen Barber
7bcf52bd4d Export WORLD_FLAGS and KERNEL_FLAGS for buildworld/buildkernel.
Sponsored by:	The FreeBSD Foundation
2014-02-03 22:51:30 +00:00
Glen Barber
476a484ecb Compress arm/armv6 images before generating checksums to reduce
image size for download.

Sponsored by:	The FreeBSD Foundation
2014-01-28 17:23:44 +00:00
Glen Barber
f2d505cd53 Add initial support for the PANDABOARD.
Sponsored by:	The FreeBSD Foundation
2014-01-28 03:09:57 +00:00
Glen Barber
416b6e64c4 Copy resulting images to top level /R directory of the chroot
to match behavior of 'make install' target of src/release/.
Generate sha256 and md5 checksums while here.

Sponsored by:	The FreeBSD Foundation
2014-01-27 13:28:55 +00:00
Glen Barber
3da8636145 Remove EMBEDDED_WORLD_FLAGS from release.sh, and move the gcc(1)
build to arm/release.sh.

This prevents needing to build a separate chroot environment for
the arm/armv6 builds when it is not absolutely necessary.  This
is useful for situations where a single userland build is used
to populate more than one chroot.

Sponsored by:	The FreeBSD Foundation
2014-01-26 01:27:53 +00:00
Glen Barber
f8089757bb Fix TARGET_ARCH and XDEV_ARCH for BEAGLEBONE, should be arm/armv6.
Sponsored by:	The FreeBSD Foundation
2014-01-25 23:59:20 +00:00
Glen Barber
45935e14a0 Explicitly set XDEV_ARCH and TARGET_ARCH to 'armv6', which resolves
boot-time issues when building 10.0-RELEASE images.

Sponsored by:	The FreeBSD Foundation
2014-01-25 09:07:55 +00:00
Glen Barber
d725697e06 Add initial support for building arm BEAGLEBONE images.
- In arm/release.sh:
   - Move crochet work directory creation to occur earlier,
     since its parent directory is needed to store a fetched
     u-boot version.

   - Add a before_build() function as a quick hack to run
     board-specific (kernel configuration specific, really)
     commands, if any.

   - For the BEAGLEBONE kernel, a specific version of u-boot
     source is needed.  Fetch the source in before_build() for
     this case.  Unfortunately, there are no checksums available
     (that I can find) for these sources.  For a quick solution,
     add the hard-coded sha256 of the tarball, and fetch from
     my public_html/ directory.  A more permanent solution for
     this needs to be found.

Add initial release.sh and crochet configuration files for the
BEAGLEBONE build.

Sponsored by:	The FreeBSD Foundation
2014-01-24 22:12:59 +00:00
Glen Barber
b479fd538c When bootstrapping the build chroot, the default environment is
set up for the amd64/amd64 TARGET/TARGET_ARCH combination.

Some of the build tools used here (u-boot in particular) require
use of gcc(1).  The lang/gcc* from ports/ will install as 'gccNN'
instead of 'gcc', so they cannot be used without extra hacks.

Add an EMBEDDED_WORLD_FLAGS variable to be used to properly set
up the build chroot.  For the RPI-B case, EMBEDDED_WORLD_FLAGS
is set to 'WITH_GCC=1', which is used to set up the build chroot.

While here, in followup to r260895, do not rely on the necessary
configuration files and/or scripts to exist in the build target
src/ tree.

To work around cases where files do not exist, copy (from the
local release/ checkout) the tools/${XDEV}/crochet-${KERNEL}.conf
to ${CHROOTDIR}/tmp/external/crochet-${KERNEL}.conf to make them
accessible to the external utilities that need them (i.e., crochet).

Sponsored by:	The FreeBSD Foundation
2014-01-19 22:25:57 +00:00
Glen Barber
34d63eb560 Implement cross build support for embedded devices into
release.sh:

 - Modify release/release.sh to recognize an 'EMBEDDEDBUILD'
   variable.  When set, release/release.sh will build the chroot
   userland as is done for big-iron builds.

 - Instead of running the 'buildworld', 'buildkernel', and
   'release' targets in the chroot, a separate script is run.
   The script tools/release/${XDEV}/release.sh sets up the rest
   of the chroot workspace, such as installing ports that will
   be needed, and building the 'xdev' target.

 - crochet (by kientzle@) is checked out from the upstream
   repository (and if needed, u-boot, in the case of Raspberry
   Pi).

 - tools/release/${XDEV}/release.sh then runs crochet with
   a configuration file specific to the ${KERNCONF} being built.

Note that this is effectively a first-pass attempt to integrate
this into the release process.

Tested against:	head@r259961
Sponsored by:	The FreeBSD Foundation
2013-12-28 02:27:06 +00:00