mirror of
https://github.com/armbian/build.git
synced 2025-08-11 13:46:58 +02:00
- WiP: Python patching delusion, pt 1: finding & parsing patches; apply & git commit with pygit2; Markdown summaries (also for aggregation); git-to-patches tool - Python: Markdown aggregation and patching summaries; collapsible; SummarizedMarkdownWriter - Python: Markdown aggregation and patching summaries - Python: reorg a bit into common/armbian_utils; define the `ASSET_LOG_BASE` in preparation for Markdown delusion - Python patching: initial apply patches & initial commit patches to git (using pygit2) - Python patching: add basic `series.conf` support - Python patching: force use of utf-8; better error handling; use realpath of dirs - Python patching: `git-to-patches` initial hack. not proud. half-reused some of the patches-to-git - Python patching: "tag" the git commits with info for extracting later; introduce REWRITE_PATCHES/rewrite_patches_in_place - Python patching: commented-out, recover-bad-patches hacks - Python patching: shorten the signature - Python patching: allow BASE_GIT_TAG as well as BASE_GIT_REVISION - Python patching: git-archeology for patches missing descriptions; avoid UTF-8 in header/desc (not diff) - Python patching: use modern-er email.utils.parsedate_to_datetime to parse commit date - Python patching: unify PatchInPatchFile; better git-commiting; re-exporting patches from Git (directly) - Python patching: switch to GitPython - GitPython is like 100x slower than pygit2, but actually allows for date & committer - also allows to remove untracked files before starting - Python aggregation: fix missing `AGGREGATED_APT_SOURCES_DICT` - Python patching: add `unidecode` dependency to pip3 install - Python patching: don't try archeology if SRC is not a Git Repo (eg, in Docker) - Python patching: don't try archeology if not applying patches to git - WiP: Python patching delusion, pt2: actually use for u-boot & kernel patching - Python patching: much better problem handling/logging; lenient with recreations (kernel) - Python patching: don't force SHOW_LOG for u-boot patching - Python patching: don't bomb for no reason when there are no patches to apply - Python patching: fully (?) switch kernel patching to Python - Python patching: more logging fixups - Python patching: capture `kernel_git_revision` from `fetch_from_repo()`'s `checked_out_revision` - Python patching: fully switch u-boot patching to Python - Python aggregation/patching: colored logging; patching: always reset to git revision - Python aggregation/patching: better logging; introduce u-boot Python patching - Python patching pt3: recovers and better Markdown - Python patching: detect, and rescue, `wrong_strip_level` problem; don't try to export patches that didn't apply, bitch instead - Python patching: Markdown patching summary table, complete with emoji - Python patching: include the problem breakdown in Markdown summary - Python patching: sanity check against half-bare, half-mbox patches - Python patching: try to recover from 1) bad utf-8 encoded patches; 2) bad unidiff patches; add a few sanity checks - Python patching: try, and fail, to apply badly utf-8 encoded patches directly as bytes [reverted] - Python patching: try to recover from patch *parse* failures; show summary; better logging - set `GIT_ARCHEOLOGY=yes` to do archeology, default not - armbian-next: Python `pip` dependencies handling, similar to `hostdeps` - same scheme for Dockerfile caching - @TODO: still using global/shared environment; should move to a dir under `cache` or some kinda venv - WiP: add `python3-pip` to hostdeps; remove `python-setuptools` - remove `python-setuptools` (Python2, no longer exists in Sid) from hostdeps - add `python3-pip` to hostdeps; part of virtualenv saga - WiP: split `kernel.sh` a bit, into `kernel-patching.sh`, `kernel-config.sh` and `kernel-make.sh` - `advanced_patch()`: rename vars for clarity; no real changes - Python patching: introduce FAST_ARCHEOLOGY; still trying for Markdown links
62 lines
2.7 KiB
Bash
62 lines
2.7 KiB
Bash
#!/usr/bin/env bash
|
|
|
|
function aggregate_all_packages() {
|
|
# Get a temporary file for the output. This is not WORKDIR yet, since we're still in configuration phase.
|
|
temp_file_for_aggregation="$(mktemp)"
|
|
|
|
# array with all parameters; will be auto-quoted by bash's @Q modifier below
|
|
declare -a aggregation_params_quoted=(
|
|
"LOG_DEBUG=${SHOW_DEBUG}" # Logging level for python.
|
|
"SRC=${SRC}"
|
|
"OUTPUT=${temp_file_for_aggregation}"
|
|
"ASSET_LOG_BASE=$(print_current_asset_log_base_file)" # base file name for the asset log; to write .md summaries.
|
|
|
|
# For the main packages, and others; main packages are not mixed with BOARD or DESKTOP packages.
|
|
# Results:
|
|
# - AGGREGATED_DEBOOTSTRAP_COMPONENTS
|
|
# - AGGREGATED_PACKAGES_DEBOOTSTRAP
|
|
# - AGGREGATED_PACKAGES_ROOTFS
|
|
# - AGGREGATED_PACKAGES_IMAGE
|
|
|
|
"ARCH=${ARCH}"
|
|
"RELEASE=${RELEASE}"
|
|
"LINUXFAMILY=${LINUXFAMILY}"
|
|
"BOARD=${BOARD}"
|
|
"USERPATCHES_PATH=${USERPATCHES_PATH}"
|
|
"SELECTED_CONFIGURATION=${SELECTED_CONFIGURATION}"
|
|
|
|
# Removals. Will remove from all lists.
|
|
"REMOVE_PACKAGES=${REMOVE_PACKAGES[*]}"
|
|
"REMOVE_PACKAGES_REFS=${REMOVE_PACKAGES_REFS[*]}"
|
|
|
|
# Extra packages in rootfs (cached)
|
|
"EXTRA_PACKAGES_ROOTFS=${EXTRA_PACKAGES_ROOTFS[*]}"
|
|
"EXTRA_PACKAGES_ROOTFS_REFS=${EXTRA_PACKAGES_ROOTFS_REFS[*]}"
|
|
|
|
# Extra packages, in image (not cached)
|
|
"EXTRA_PACKAGES_IMAGE=${EXTRA_PACKAGES_IMAGE[*]}"
|
|
"EXTRA_PACKAGES_IMAGE_REFS=${EXTRA_PACKAGES_IMAGE_REFS[*]}"
|
|
|
|
# Desktop stuff; results are not mixed into main packages. Results in AGGREGATED_PACKAGES_DESKTOP.
|
|
"BUILD_DESKTOP=${BUILD_DESKTOP}"
|
|
"DESKTOP_ENVIRONMENT=${DESKTOP_ENVIRONMENT}"
|
|
"DESKTOP_ENVIRONMENT_CONFIG_NAME=${DESKTOP_ENVIRONMENT_CONFIG_NAME}"
|
|
"DESKTOP_APPGROUPS_SELECTED=${DESKTOP_APPGROUPS_SELECTED}"
|
|
|
|
# Those are processed by Python, but not part of rootfs / main packages; results in AGGREGATED_PACKAGES_IMAGE_INSTALL
|
|
# These two vars are made readonly after sourcing the board / family config, so can't be used in extensions and such.
|
|
"PACKAGE_LIST_FAMILY=${PACKAGE_LIST_FAMILY}"
|
|
"PACKAGE_LIST_BOARD=${PACKAGE_LIST_BOARD}"
|
|
|
|
# Those are processed by Python, but not part of rootfs / main packages; results in AGGREGATED_PACKAGES_IMAGE_UNINSTALL
|
|
# These two vars are made readonly after sourcing the board / family config, so can't be used in extensions and such.
|
|
"PACKAGE_LIST_BOARD_REMOVE=${PACKAGE_LIST_BOARD_REMOVE}"
|
|
"PACKAGE_LIST_FAMILY_REMOVE=${PACKAGE_LIST_FAMILY_REMOVE}"
|
|
)
|
|
run_host_command_logged env -i "${aggregation_params_quoted[@]@Q}" python3 "${SRC}/lib/tools/aggregation.py"
|
|
#run_host_command_logged cat "${temp_file_for_aggregation}"
|
|
# shellcheck disable=SC1090
|
|
source "${temp_file_for_aggregation}" # SOURCE IT!
|
|
run_host_command_logged rm "${temp_file_for_aggregation}"
|
|
}
|