Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

As grub-mkconfig command does not work, maybe a minimal grub.cfg
file directly on the filesystem will.

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

[buildarmimg] generic-efi image improvements, now reaches grub rescue, still need to get a grub.cfg generated

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

[buildarmimg] up the extra size reserved for the image to 1200MB instead og 1000 in the hopes it fixes github actions

Signed-off-by: Dan Johansen <strit@manjaro.org>

[buildarmimg] up the extra size reserved for the image to 1000MB instead og 800 in the hopes it fixes github actions

Signed-off-by: Dan Johansen <strit@manjaro.org>

This reverts commit d8d20192

Github builds have been running out of space lately in the copy files to image stage.

This is an attempt to make the image build fail of that happens, instead of just continuing.

I might revert this if it does not help in my tests.

Signed-off-by: Dan Johansen <strit@manjaro.org>

Dragan Simic authored Jul 13, 2022 and Dan Johansen committed Jul 13, 2022

Complete the "no colored output by default" changes started in
the previous two commits, by extending the color output settings
to the "paccache" invocations as well.

At the same time, perform some improvements and code cleanups,
as spotted while going through the source code.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jul 12, 2022 and Dan Johansen committed Jul 13, 2022

Improve the logging so all messages going to stderr are also
captured and stored into the generated log files.  Change the
custom messaging functions in lib/functions.sh to output the
messages to stdout instead of stderr, because there was no
real need or benefit from using stderr.

Complete the "no colored output by default" changes started in
the previous commit, by extending the color output settings to
"pacman" and "makepkg" themselves.

At the same time, perform some improvements and code cleanups,
as spotted while going through the source code.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jul 12, 2022 and Dan Johansen committed Jul 12, 2022

Change the logic a bit so the colored output of the utilities
is turned off by default, which ensures that the generated log
files don't contain ugly-looking escape sequences.

At the same time, perform some improvements and code cleanups,
as spotted while going through the source code.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jul 12, 2022 and Dan Johansen committed Jul 12, 2022

Make the produced log files much, much more readable by telling
"pacman" not to display progress bars when downloading files.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Make "/etc/os-release" available

See merge request !14

Dragan Simic authored Jul 11, 2022 and Dan Johansen committed Jul 12, 2022

Generating the initramfs images by "mkinitcpio" requires the
"/etc/os-release" file to be already present as a symlink to
"/usr/lib/os-release", which is normally performed by systemd
in the "/usr/lib/tmpfiles.d/etc.conf" file.  Thus, ensure that
the required symlink already exists in the rootfs directory
before "pacstrap" or "pacman" are executed.

At the same time, perform some improvements and code cleanups,
as spotted while going through the source code.  Also, change
the timestamp format in the generated log filenames to a more
common (and more readable) format.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jul 04, 2022 and Dan Johansen committed Jul 04, 2022

A few instances of executing "rm -r" or "rm -rf" on directories
have been changed to "rmdir" in previous commits, because those
directories should be empty at that point, which introduced some
kind of a "canary" for such directories.

Complete those "canaries" by actually aborting the execution of
a utility if such "rmdir" operations fail.  It's a critical error
anyway, because it means something went seriously wrong, and it
should be inspected by hand.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jul 04, 2022 and Dan Johansen committed Jul 04, 2022

Create a filesystem "marker" that tells the packages that they're
installed as part of building an image so they can adjust their
behavior as required, which is currently used for the /etc/fstab
adjustments in the "generic-post-install" package only.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jul 01, 2022 and Dan Johansen committed Jul 04, 2022

Perform a whole bunch of code cleanups and readability
improvements, as spotted while going through the code.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Various improvements and rewrite local packages function

See merge request !13

Dragan Simic authored Jun 27, 2022 and Dan Johansen committed Jun 27, 2022

Hopefully, fix the issues with installing local packages by
saving the list of package files in the check_local_pkgs()
function and using it later, to avoid issues with the wildcard
expansion in "pacman -U" invocations.

At the same time, simplify the handling of the absolute path
in the check_local_pkgs() function a bit.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jun 27, 2022 and Dan Johansen committed Jun 27, 2022

Fix the paths to local packages passed to "pacman", and allow
error handling to do its thing instead of aborting early.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jun 27, 2022 and Dan Johansen committed Jun 27, 2022

The last commit or two failed to resolve the issues with bind
mounting directories with the local packages, because the current
directory was changed somewhere and the directory with the local
packages no longer matched the real location.  Fix that by saving
the actual directory early and reusing it later.  Also, change
a few invocations of "wget" so no current directory changes are
performed prior to those invocations, in an atttempt to prevent
similar issues from happening again somewhere else.

At the same time, use the least amount of "force" while removing
empty temporary directories used as mount points, i.e. use "rmdir"
to remove them, instead of using "rm -rf".

Perform a few more small cleanups and improvements in the produced
messages and comments, as well as a bit of code deduplication in
error handling, as spotted.  Also, remove redundant "-N" parameters
in a few invocations of "wget".

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jun 27, 2022 and Dan Johansen committed Jun 27, 2022

Fix the way bind mounts are performed by using "mount --bind"
instead of "mount -o bind".  How did "mount -o bind" actually
work before in a few places?  Hmm...

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jun 27, 2022 and Dan Johansen committed Jun 27, 2022

Improve the local package checks so the temporary files are
created in /tmp instead of in the current directory.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jun 27, 2022 and Dan Johansen committed Jun 27, 2022

Fix the way bind mounts are performed by using full filesystem
paths.  At the same time, add more logged messages, so the work
performed by the utilities can be monitored more easily.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jun 27, 2022 and Dan Johansen committed Jun 27, 2022

Fix a silly bug in one of the early checks performed in the
check_local_pkgs() function, which caused perfectly valid
directories with local packages to be rejected.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jun 27, 2022 and Dan Johansen committed Jun 27, 2022

Update the README.md file so it's in sync with the latest changes
in the source code.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Dragan Simic authored Jun 22, 2022 and Dan Johansen committed Jun 27, 2022

Perform various small cleanups, as spotted, which include
proper indentation, uniform style of function and variable
names, some improvements to the produced help messages and
comments in the code, removal of redundant parameters for
the "cp -a" invocations, removal of the redundant trailing
slashes, simplification of redundant "1>" redirections,
small code readability improvements, and quite a bit of
other small coding style cleanups.

Perform a rewrite of the entire logic that handles local
packages that are to be installed to the root filesystem
in the images.  Previously, that logic was overly complex
and somewhat broken, more specifically it performed various
redundants operations, and it did not work under certain
conditions because it expected the local packages to be
actually present in the pacman cache, etc.

At the same time, call the verify_local_packages() function
in "bin/buildemmcinstaller" as well, to have the same check
as the one that's already performed in the "bin/buildarmimg"
and "bin/buildarmpkg" files.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

The package name and other files recently changed name in the uboot package for the Orange Pi 3 LTS.
So it is no longer called the same as the device profile.

Fix this by creating a flashing command specific for the Orange Pi 3 LTS.

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>

Signed-off-by: Dan Johansen <strit@manjaro.org>