-
Notifications
You must be signed in to change notification settings - Fork 388
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
T6684: new Debian package repo snapshot logic
Added functionality to store version information for temporarily installed packages.
- Loading branch information
1 parent
a26ef9e
commit 13bc96d
Showing
1 changed file
with
17 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,44 @@ | ||
| From 3ddf0e979c352f2917be6a949fb8dd37b5c9f2b7 Mon Sep 17 00:00:00 2001 | ||
| From 9dacc8bf99310b2216be24a42f2c0475080cf039 Mon Sep 17 00:00:00 2001 | ||
| From: khramshinr <[email protected]> | ||
| Date: Wed, 28 Aug 2024 14:38:15 +0600 | ||
| Date: Thu, 24 Oct 2024 14:22:57 +0600 | ||
| Subject: [PATCH] T6684: new Debian package repo snapshot logic | ||
|
|
||
| save information about all installed packages and teir source repo, including temporary packages | ||
| Save information about all installed packages and teir source repo, including temporary packages | ||
| Added functionality to store version information for temporarily installed packages. | ||
| --- | ||
| functions/packages.sh | 7 +++++++ | ||
| functions/packages.sh | 9 +++++++++ | ||
| scripts/build/chroot | 6 ++++++ | ||
| scripts/build/clean | 2 +- | ||
| 3 files changed, 14 insertions(+), 1 deletion(-) | ||
| 3 files changed, 16 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/functions/packages.sh b/functions/packages.sh | ||
| index 9e25df5f3..4d1fa695e 100755 | ||
| index 2481edc25..a6c2c1e8d 100755 | ||
| --- a/functions/packages.sh | ||
| +++ b/functions/packages.sh | ||
| @@ -60,6 +60,13 @@ Install_packages () | ||
| @@ -60,6 +60,15 @@ Install_packages () | ||
| Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LB_PACKAGES}" | ||
| ;; | ||
| esac | ||
| + | ||
| + # save information about all temporary installed packages and source repos | ||
| + for PACKAGE in ${_LB_PACKAGES}; do | ||
| + Chroot chroot "apt-cache policy ${PACKAGE}" | sed -n '/\*\*\*/,$p' | grep -P 'http:|https:' -m 1 | awk -v pkg="${PACKAGE}" '{print $2" "$3" "pkg}' >> chroot.packages.all.info | ||
| + INSTALLED_VERSION=$(Chroot chroot "apt-cache policy ${PACKAGE}" | grep 'Installed:' | awk '{print $2}') | ||
| + Chroot chroot "apt-cache policy ${PACKAGE}" | sed -n '/\*\*\*/,$p' | grep -P 'http:|https:' -m 1 | \ | ||
| + awk -v pkg="${PACKAGE}" -v version="${INSTALLED_VERSION}" '{print $2" "$3" "pkg" "version}' >> chroot.packages.all.info | ||
| + | ||
| + done | ||
| + | ||
| unset _LB_PACKAGES # Can clear this now | ||
| } | ||
|
|
||
| diff --git a/scripts/build/chroot b/scripts/build/chroot | ||
| index a0aa10be0..700762e78 100755 | ||
| --- a/scripts/build/chroot | ||
| +++ b/scripts/build/chroot | ||
| @@ -48,6 +48,12 @@ for _PASS in install live; do | ||
| fi | ||
| done | ||
|
|
||
| +# save information about all installed packages and source repos | ||
| +Chroot chroot "dpkg-query -W" | while read PACKAGE; do | ||
| + Chroot chroot "apt-cache policy ${PACKAGE}" | sed -n '/\*\*\*/,$p' | grep -P 'http:|https:' -m 1 | awk -v pkg="${PACKAGE}" '{print $2" "$3" "pkg}' >> chroot.packages.all.info | ||
|
|
@@ -50,11 +53,12 @@ index 6549fc635..4376d7525 100755 | |
| --- a/scripts/build/clean | ||
| +++ b/scripts/build/clean | ||
| @@ -159,7 +159,7 @@ if [ "${RM_CHROOT}" = "true" ]; then | ||
|
|
||
| rm -rf chroot chroot.tmp | ||
|
|
||
| - rm -f chroot.packages.live chroot.packages.install | ||
| + rm -f chroot.packages.live chroot.packages.install chroot.packages.all.info | ||
| rm -f chroot.files | ||
|
|
||
| rm -f "$(Installed_tmp_packages_file)" | ||
|
|
||
| rm -f "$(Installed_tmp_packages_file)" | ||