7348 Commits

Author SHA1 Message Date
gjb
f378874c7a Fix staging virtual machine images for ftp propagation.
MFC after:	3 days
X-MFC-Note:	needs all previous changes
Sponsored by:	The FreeBSD Foundation
2015-05-22 21:38:11 +00:00
gjb
72b5c02439 Fix a number of logic and/or naming problems in Makefile.mirrors.
Reduce a number of duplicated logic.

As of this commit, this file does exactly what it is needed to do.

MFC after:	3 days
X-MFC-Note:	needs all previous changes
Sponsored by:	The FreeBSD Foundation
2015-05-22 21:04:42 +00:00
gjb
bc74bc7ccc Fix make(1) syntax error for non-embedded targets.
Sponsored by:	The FreeBSD Foundation
2015-05-21 22:50:39 +00:00
gjb
0641ba25df If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable,
which helps control some of the arm-specific bits a bit more
cleanly (but not really 'clean').

If BOARDNAME is defined (as is in the WANDBOARD configuration
RE uses), do some magic to work with the KERNCONF and BOARDNAME
to rename the file, making it a bit more intuitive for the
consumer to determine which they need.

Yes, it is ugly, that is why there is a big warning at the top.
It is, however, still much cleaner than the now 474-line shell
script, and this Makefile produces the hierarchy needed without
much evil.

MFC after:	1 week
X-MFC-Note:	needs all previous Makefile.mirror commits
Sponsored by:	The FreeBSD Foundation
2015-05-21 22:11:57 +00:00
gjb
c06534502b Remove the arm/armv6 bits from Makefile.mirrors, which needs
some re-thinking.

Sponsored by:	The FreeBSD Foundation
2015-05-21 20:43:02 +00:00
gjb
2b3486294e Include xz(1)-compressed images when not a snapshot build.
Do not suffix non-snapshot checksum files with SNAP_SUFFIX.

Sponsored by:	The FreeBSD Foundation
2015-05-21 20:22:55 +00:00
gjb
b4ea1ed9e1 cd(1) to .CURDIR before calling stat(1) to fix the path
to sh(1).

Include xz(1)-compressed images when renaming snapshot
builds.

Use OSRELEASE in place of REVISION-BRANCH for checksum
filenames.

Sponsored by:	The FreeBSD Foundation
2015-05-21 20:18:13 +00:00
gjb
ba307f79ae Include the TARGET in the EC2 AMI name.
Without this, AWS rejects subsequent image uploads of a different
architecture because the name conflicts.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-21 17:39:42 +00:00
gjb
97e0e7cffb Avoid polluting the filesystem when not necessary.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:27:58 +00:00
gjb
2ea98057df After the last influx of commits, and a REALLY BIG WARNING
to the top of the file.

Sponsored by:	The FreeBSD Foundation
2015-05-12 01:20:27 +00:00
gjb
56dbacefd5 Fix more paths to the actual files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:14:21 +00:00
gjb
f47265fd69 Fix more path variables.
Sponsored by:	The FreeBSD Foundation
2015-05-12 01:04:02 +00:00
gjb
9d7a2f8ca8 Provide the correct path to the checksum file.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:58:17 +00:00
gjb
ed602f1d5e Also symlink the CHECKSUM.{SHA256,MD5} files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:55:28 +00:00
gjb
e5abe6f698 Also copy CHECKSUM.{SHA256,MD5} files.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:46:32 +00:00
gjb
311d76861e Fix a few incorrect variables and/or hard-coded paths.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:39:01 +00:00
gjb
8dde0f5cc4 Sigh. Fix more syntax errors introduced by the last commit.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:33:18 +00:00
gjb
0b6e1d985f Fix a make(1) syntax error.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:32:28 +00:00
gjb
7e0d11ef0c Temporarily 'rm -rf $FTPDIR' during additional testing.
Sponsored by:	The FreeBSD Foundation
2015-05-12 00:30:56 +00:00
gjb
8b206d5386 Always use the 'make install' directory as the source for images.
For RE purposes, we use the default (/R within the chroot), so
this helps avoid copying files multiple times and xz(1)-compressing
additional times when not needed.

Again, this Makefile is not for general consumption.

Sponsored by:	The FreeBSD Foundation
2015-05-12 00:27:52 +00:00
gjb
48a106e740 Add a new file, Makefile.mirrors, which is intended to replace
a 474-line kludge of a shell script to pre-create the directory
hierarchy on ftp-master.

This is not in any way connected to the build, and there is no
intention to do so.  This only intent here is to try to make
things a little bit easier for me.  But I've probably just made
things worse.

Sponsored by:	The FreeBSD Foundation
2015-05-11 22:14:03 +00:00
gjb
f930e15914 Fix virtual machine disk format creating by passing VMFORMAT
to mkimg(1)

PR:		200068
Submitted by:	Jeremy Norris
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2015-05-11 14:53:07 +00:00
gjb
fb117627f6 Merge ^/projects/release-arm-redux into ^/head.
Of note:

- This commit adds native FreeBSD/arm release build support without
  requiring out-of-tree utilities.

- Part of this merge removes the WANDBOARD-{SOLO,DUAL,QUAD} kernel
  configuration files, for which the IMX6 kernel configuration file
  should be used instead.

- The resulting images have a 'freebsd' user (password 'freebsd'),
  to allow ssh(1) access when console access is not available (VGA
  or serial).  The default 'root' user password is set to 'root'.

- The /etc/ttys file for arm images now enable both ttyv0 and ttyu0
  by default.

Help from:	many (boot testing, feedback, etc.)
Sponsored by:	The FreeBSD Foundation
2015-05-09 21:08:12 +00:00
gjb
6c40325758 Use the IMX6 kernel configuration for the WANDBOARD build,
since it supports all of these board variants.

While here, remove the WANDBOARD-{QUAD,SOLO,DUAL} kernel
configuration files.

Discussed with:	ian
Sponsored by:	The FreeBSD Foundation
2015-05-08 18:55:09 +00:00
gjb
83dbcdd679 Strip the KERNEL from the mount paths, working around the following
error:

 root@releng2:/ # mount_msdosfs /dev/md5s1 /usr/obj/usr/src/release/WANDBOARD-QUAD/fat
 mount_msdosfs: /dev/md5s1: File name too long

Sponsored by:	The FreeBSD Foundation
2015-05-08 18:45:32 +00:00
gjb
eff85709da Fix path to the u-boot.imx file, which is relative to the root of
the chroot environment.

Sponsored by:	The FreeBSD Foundation
2015-05-08 17:53:44 +00:00
gjb
53b50c1a76 Touch '/firstboot' so the growfs rc(8) script runs.
Sponsored by:	The FreeBSD Foundation
2015-05-08 16:41:21 +00:00
gjb
d92941fb7d Fix the starting block of the partition.
Sponsored by:	The FreeBSD Foundation
2015-05-08 16:37:57 +00:00
gjb
261ee6d1dc Initial support for building the PANDABOARD image.
Sponsored by:	The FreeBSD Foundation
2015-05-08 16:00:06 +00:00
gjb
cf3aaa44c3 Add a file missed in the previous commit.
Sponsored by:	The FreeBSD Foundation
2015-05-08 15:23:21 +00:00
gjb
5924ca13e5 Copy arm/WANDBOARD-QUAD.conf to arm/WANDBOARD-{SOLO,DUAL}.conf.
Ian informed me a few months ago that the WANDBOARD-* kernels will
eventually be combined into one that will work across all these
boards, but for now, build them individually.

Sponsored by:	The FreeBSD Foundation
2015-05-08 15:22:29 +00:00
gjb
692717cb48 Fix FAT partition size.
Sponsored by:	The FreeBSD Foundation
2015-05-08 15:18:31 +00:00
gjb
d16bf9c909 Sigh. Really fix CHECKSUM file creation.
Sponsored by:	The FreeBSD Foundation
2015-05-08 15:15:36 +00:00
gjb
c7d77fb592 Fix CHECKSUM file creation.
Sponsored by:	The FreeBSD Foundation
2015-05-08 15:10:00 +00:00
gjb
26e678e2ac Initial support for building WANDBOARD-QUAD images.
Several parts of this were obtained from Crochet.

Sponsored by:	The FreeBSD Foundation
2015-05-08 15:07:17 +00:00
gjb
684abf744f Initial commit to support building RPI2 images, based on information
and documentation written by loos@ on the Wiki.

Sponsored by:	The FreeBSD Foundation
2015-05-08 13:55:27 +00:00
gjb
9aa9f68bf0 Do not include '/R' in the path when generating checksums, since
that will cause '/R' to be included in the CHECKSUM files.

Sponsored by:	The FreeBSD Foundation
2015-05-08 12:55:25 +00:00
gjb
cdb1ccc959 Move the finished image build to the '/R' directory (the
standard 'install' location for other architectures), then
compress the image with xz(1), and generate the CHECKSUM
files.

Sponsored by:	The FreeBSD Foundation
2015-05-08 12:50:48 +00:00
gjb
d03c979953 Fix the name of the final image.
Sigh.  Thou shalt not commit before coffee.

Sponsored by:	The FreeBSD Foundation
2015-05-08 10:47:57 +00:00
gjb
28058afb01 Rename KERNEL.img -> OSRELEASE-KERNEL.img when complete.
Sponsored by:	The FreeBSD Foundation
2015-05-08 10:43:29 +00:00
gjb
dc4500ae96 Do not create the uenv.txt file for RPI-B. It is not needed.
Submitted by:	ian
Sponsored by:	The FreeBSD Foundation
2015-05-08 10:39:52 +00:00
gjb
c8fa25fd06 Fix path to /boot/msdos for the target image.
Sponsored by:	The FreeBSD Foundation
2015-05-08 10:38:32 +00:00
gjb
d0610f154f Copy the rpi.dtb file to the FAT partition, preventing the
'Unrecognized partition table' error, causing boot failure.

Sponsored by:	The FreeBSD Foundation
2015-05-07 23:49:48 +00:00
gjb
463d845cba Reorder / and /boot/msdos mount to avoid the following error:
Mounting local file systems:
mount: /boot/msdos: No such file or directory

Sponsored by:	The FreeBSD Foundation
2015-05-07 23:46:33 +00:00
gjb
2bf3795a46 Create the /boot/msdos directory so the FAT partition is mounted
properly.

Noticed by:	sbruno
Sponsored by:	The FreeBSD Foundation
2015-05-07 20:25:17 +00:00
gjb
5c43f80d54 Remove the ZEDBOARD configuration file, as it does not
have a corresponding u-boot port in the Ports Collection.

Sponsored by:	The FreeBSD Foundation
2015-05-07 20:06:39 +00:00
gjb
22a124cc4e Spell 'u-boot.img' correctly.
Sponsored by:	The FreeBSD Foundation
2015-05-07 20:02:50 +00:00
gjb
8642bea698 Remove the arm/ROADMAP file.
Sponsored by:	The FreeBSD Foundation
2015-05-07 19:48:06 +00:00
gjb
6d28b8313e Remove arm/Makefile.{KERNEL} files, as this project
branch is now going in a different direction than
originally planned.

Sponsored by:	The FreeBSD Foundation
2015-05-07 19:47:15 +00:00
gjb
adf94dc7b1 Fix creating directories within DESTDIR.
Sponsored by:	The FreeBSD Foundation
2015-05-07 19:10:08 +00:00