Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust "/var/lib/apt/lists" and "/var/cache/apt" exclusion to be less aggressive #61

Merged
merged 1 commit into from
Apr 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ env:
- SUITE=oldstable CODENAME=wheezy TIMESTAMP=2017-01-01T00:00:00Z SHA256=f1bd72548e3c25ce222fb9e2bb57a5b6d4b01042180894fb05d83a0251e6dab1
- SUITE=wheezy CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=f1bd72548e3c25ce222fb9e2bb57a5b6d4b01042180894fb05d83a0251e6dab1
# EOL suites testing
- SUITE=eol CODENAME=etch TIMESTAMP=2017-01-01T00:00:00Z SHA256=eb005e297101b8e4555a08e96395fa0575cbdddf4901a081948b17a4039939bd
- SUITE=eol CODENAME=lenny TIMESTAMP=2017-01-01T00:00:00Z SHA256=6bcd3bfe6916dcf6e4f923d8eddcb41105fc8c0d002765fbca7d9f95e346019e
- SUITE=eol CODENAME=woody ARCH=i386 TIMESTAMP=2017-01-01T00:00:00Z SHA256=a1457a071c39bd0c54755a27430475896dd1623a743a7d34c6a1b951a4aaea0a
- SUITE=eol CODENAME=etch TIMESTAMP=2017-01-01T00:00:00Z SHA256=b48e999ab4fda1720b0dc863d38cdd4d6b55530f34f262a28949eb6173102da9
- SUITE=eol CODENAME=lenny TIMESTAMP=2017-01-01T00:00:00Z SHA256=1a2fffd34daa4a6bb968aebe86480a4093035a23700ec5f2e883423b9b4dcfa7
- SUITE=eol CODENAME=woody ARCH=i386 TIMESTAMP=2017-01-01T00:00:00Z SHA256=ef4bc81e31db51fa9f095811ddbcc8a005f05f098596317d5a138fa90157bf40
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💪 (exactly the diff I was expecting)

$ diffoscope --exclude-directory-metadata travis-pre-61 travis
--- travis-pre-61
+++ travis
├── 20170101
│ ├── amd64
│ │ ├── etch
│ │ │ ├── rootfs.tar.xz
│ │ │ │ ├── rootfs.tar
│ │ │ │ │ ├── file list
│ │ │ │ │ │ @@ -5399,24 +5399,27 @@
│ │ │ │ │ │  -rw-r--r--   0        0        0    18684 2008-06-30 22:37:16.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2006-10-28 14:07:42.000000 usr/src/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/backups/
│ │ │ │ │ │  -rw-r--r--   0        0        0     1470 2017-01-01 00:00:00.000000 var/backups/infodir.bak
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2007-08-17 08:53:56.000000 var/cache/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │  -rw-r--r--   0        0        0     1144 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │  -rw-r--r--   0        0        0      616 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │  -rw-------   0        0        0      500 2017-01-01 00:00:00.000000 var/cache/debconf/passwords.dat
│ │ │ │ │ │  -rw-r--r--   0        0        0   265312 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │  -rw-r--r--   0        0        0   173457 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2007-08-17 08:53:56.000000 var/cache/locate/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2008-05-21 08:44:04.000000 var/lib/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2009-04-21 09:32:59.000000 var/lib/apt/periodic/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │  -rw-r--r--   0        0        0      207 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │  -rw-r--r--   0        0        0       83 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/builtins.7.gz
│ │ │ │ │ │  -rw-r--r--   0        0        0      150 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/pager
│ │ │ │ │ │  -rw-r--r--   0        0        0      113 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/rmt
│ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ @@ -1 +1 @@
│ │ │ │ -eb005e297101b8e4555a08e96395fa0575cbdddf4901a081948b17a4039939bd
│ │ │ │ +b48e999ab4fda1720b0dc863d38cdd4d6b55530f34f262a28949eb6173102da9
│ │ │ ├── sbuild
│ │ │ │ ├── rootfs.tar.xz
│ │ │ │ │ ├── rootfs.tar
│ │ │ │ │ │ ├── file list
│ │ │ │ │ │ │ @@ -10466,24 +10466,27 @@
│ │ │ │ │ │ │  -rw-r--r--   0        0        0    18684 2008-06-30 22:37:16.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2006-10-28 14:07:42.000000 usr/src/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/backups/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     1528 2017-01-01 00:00:00.000000 var/backups/infodir.bak
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2007-08-17 08:53:56.000000 var/cache/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     1144 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      616 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │ │  -rw-------   0        0        0      500 2017-01-01 00:00:00.000000 var/cache/debconf/passwords.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   265312 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   173457 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2007-08-17 08:53:56.000000 var/cache/locate/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2008-05-21 08:44:04.000000 var/lib/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2009-04-21 09:32:59.000000 var/lib/apt/periodic/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      207 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │ │  -rw-r--r--   0        0        0       83 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/builtins.7.gz
│ │ │ │ │ │ │  -rw-r--r--   0        0        0       36 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/c++
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      111 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/c89
│ │ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ │ @@ -1 +1 @@
│ │ │ │ │ -eef208619fb40fa0fe4a4315e551655e385363a1aed3b5e26052f36647447c0b
│ │ │ │ │ +2f3bbc8df15ecf9742f438d334175a484c5e10563bb6ce248d35da721c394592
│ │ │ ├── slim
│ │ │ │ ├── rootfs.tar.xz
│ │ │ │ │ ├── rootfs.tar
│ │ │ │ │ │ ├── file list
│ │ │ │ │ │ │ @@ -3442,24 +3442,27 @@
│ │ │ │ │ │ │  -rw-r--r--   0        0        0    18684 2008-06-30 22:37:16.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2006-10-28 14:07:42.000000 usr/src/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/backups/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     1470 2017-01-01 00:00:00.000000 var/backups/infodir.bak
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2007-08-17 08:53:56.000000 var/cache/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     1144 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      616 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │ │  -rw-------   0        0        0      500 2017-01-01 00:00:00.000000 var/cache/debconf/passwords.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   265312 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   173457 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2007-08-17 08:53:56.000000 var/cache/locate/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2008-05-21 08:44:04.000000 var/lib/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2009-04-21 09:32:59.000000 var/lib/apt/periodic/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      207 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │ │  -rw-r--r--   0        0        0       83 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/builtins.7.gz
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      150 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/pager
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      113 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/rmt
│ │ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ │ @@ -1 +1 @@
│ │ │ │ │ -68552a996553697b6f5b8e3bdb52871dbd0518259863b4e8c322f3ed45547305
│ │ │ │ │ +92f1ac53191c196bbd150b8175fe5ed1c6fca56b3795a0077aff1ce881a3f3cd
│ │ ├── lenny
│ │ │ ├── rootfs.tar.xz
│ │ │ │ ├── rootfs.tar
│ │ │ │ │ ├── file list
│ │ │ │ │ │ @@ -6083,25 +6083,28 @@
│ │ │ │ │ │  -rw-r--r--   0        0        0    19848 2011-09-20 21:37:30.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2012-02-16 19:51:15.000000 usr/src/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/backups/
│ │ │ │ │ │  -rw-r--r--   0        0        0     1380 2017-01-01 00:00:00.000000 var/backups/infodir.bak
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │  -rw-r--r--   0        0        0     2085 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │  -rw-r--r--   0        0        0     1103 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │  -rw-------   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/passwords.dat
│ │ │ │ │ │  -rw-r--r--   0        0        0   302278 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │  -rw-r--r--   0        0        0   186969 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │  drwx------   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/ldconfig/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │  -rw-r--r--   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/extended_states
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2010-05-13 15:40:35.000000 var/lib/apt/periodic/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │  -rw-r--r--   0        0        0      207 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │  -rw-r--r--   0        0        0       83 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/builtins.7.gz
│ │ │ │ │ │  -rw-r--r--   0        0        0      150 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/pager
│ │ │ │ │ │  -rw-r--r--   0        0        0      113 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/rmt
│ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ @@ -1 +1 @@
│ │ │ │ -6bcd3bfe6916dcf6e4f923d8eddcb41105fc8c0d002765fbca7d9f95e346019e
│ │ │ │ +1a2fffd34daa4a6bb968aebe86480a4093035a23700ec5f2e883423b9b4dcfa7
│ │ │ ├── sbuild
│ │ │ │ ├── rootfs.tar.xz
│ │ │ │ │ ├── rootfs.tar
│ │ │ │ │ │ ├── file list
│ │ │ │ │ │ │ @@ -9796,25 +9796,28 @@
│ │ │ │ │ │ │  -rw-r--r--   0        0        0    19848 2011-09-20 21:37:30.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2012-02-16 19:51:15.000000 usr/src/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/backups/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     1438 2017-01-01 00:00:00.000000 var/backups/infodir.bak
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     2085 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     1103 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │ │  -rw-------   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/passwords.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   302278 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   186969 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │ │  drwx------   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/ldconfig/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      834 2017-01-01 00:00:00.000000 var/lib/apt/extended_states
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2010-05-13 15:40:35.000000 var/lib/apt/periodic/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      207 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │ │  -rw-r--r--   0        0        0       83 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/builtins.7.gz
│ │ │ │ │ │ │  -rw-r--r--   0        0        0       36 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/c++
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      111 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/c89
│ │ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ │ @@ -1 +1 @@
│ │ │ │ │ -b120c6075da9e17e31c15e81bef290118cfb3bcafb8f527cdad15167704da8a1
│ │ │ │ │ +2969fb173a1c912ea04d32d02d10a7d4e915ff36dd04fb09dd43ceb9856c64e9
│ │ │ ├── slim
│ │ │ │ ├── rootfs.tar.xz
│ │ │ │ │ ├── rootfs.tar
│ │ │ │ │ │ ├── file list
│ │ │ │ │ │ │ @@ -4020,24 +4020,27 @@
│ │ │ │ │ │ │  -rw-r--r--   0        0        0    19848 2011-09-20 21:37:30.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2012-02-16 19:51:15.000000 usr/src/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/backups/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     1380 2017-01-01 00:00:00.000000 var/backups/infodir.bak
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     2085 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0     1103 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │ │  -rw-------   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/passwords.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   302278 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   186969 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │ │  drwx------   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/ldconfig/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2010-05-13 15:40:35.000000 var/lib/apt/periodic/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      207 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │ │  -rw-r--r--   0        0        0       83 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/builtins.7.gz
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      150 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/pager
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      113 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/rmt
│ │ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ │ @@ -1 +1 @@
│ │ │ │ │ -59b9bc0f6a31973d54cac9659942b49e374b8a383a1308479dcfad7f77426f88
│ │ │ │ │ +f5d793adacabe6a86952a247219a13491a45fad16c9e9d852a6b8e7529a6017c
│ ├── i386
│ │ ├── woody
│ │ │ ├── rootfs.tar.xz
│ │ │ │ ├── rootfs.tar
│ │ │ │ │ ├── file list
│ │ │ │ │ │ @@ -6397,23 +6397,26 @@
│ │ │ │ │ │  hrw-r--r--   0        0        0        0 2005-01-07 12:04:51.000000 usr/share/zoneinfo/right/Zulu
│ │ │ │ │ │  -rw-r--r--   0        0        0    17030 2005-01-07 12:04:51.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2002-02-08 15:42:00.000000 usr/src/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2002-02-08 15:42:00.000000 var/backups/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │  -rw-------   0        0        0    34207 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │  -rw-------   0        0        0    33335 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │  -rw-r--r--   0        0        0   284621 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │  -rw-r--r--   0        0        0   268070 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │  drwxr-sr-x   0        6        0        0 2003-08-16 03:09:17.000000 var/cache/man/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dhcp/
│ │ │ │ │ │  -rw-r--r--   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dhcp/dhclient.leases
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │  -rw-r--r--   0        0        0      208 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │  -rw-r--r--   0        0        0       96 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/dhcp-options.5.gz
│ │ │ │ │ │  -rw-r--r--   0        0        0      173 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/editor
│ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ @@ -1 +1 @@
│ │ │ │ -a1457a071c39bd0c54755a27430475896dd1623a743a7d34c6a1b951a4aaea0a
│ │ │ │ +ef4bc81e31db51fa9f095811ddbcc8a005f05f098596317d5a138fa90157bf40
│ │ │ ├── sbuild
│ │ │ │ ├── rootfs.tar.xz
│ │ │ │ │ ├── rootfs.tar
│ │ │ │ │ │ ├── file list
│ │ │ │ │ │ │ @@ -8946,23 +8946,26 @@
│ │ │ │ │ │ │  hrw-r--r--   0        0        0        0 2005-01-07 12:04:51.000000 usr/share/zoneinfo/right/Zulu
│ │ │ │ │ │ │  -rw-r--r--   0        0        0    17030 2005-01-07 12:04:51.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2002-02-08 15:42:00.000000 usr/src/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2002-02-08 15:42:00.000000 var/backups/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │ │  -rw-------   0        0        0    34403 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │ │  -rw-------   0        0        0    34207 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   290003 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   284621 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │ │  drwxr-sr-x   0        6        0        0 2003-08-16 03:09:17.000000 var/cache/man/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dhcp/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dhcp/dhclient.leases
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      208 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      103 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/c++
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      100 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/cc
│ │ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ │ @@ -1 +1 @@
│ │ │ │ │ -5ac92fbafeaadf468a5c09e1964cccc1d451019fdc7ba2a7a689eed35acb2aaf
│ │ │ │ │ +b2ff9bccacb6a0ef619b303906eee10111d188b8cc92d9d638d261f5494c4f9d
│ │ │ ├── slim
│ │ │ │ ├── rootfs.tar.xz
│ │ │ │ │ ├── rootfs.tar
│ │ │ │ │ │ ├── file list
│ │ │ │ │ │ │ @@ -4350,23 +4350,26 @@
│ │ │ │ │ │ │  hrw-r--r--   0        0        0        0 2005-01-07 12:04:51.000000 usr/share/zoneinfo/right/Zulu
│ │ │ │ │ │ │  -rw-r--r--   0        0        0    17030 2005-01-07 12:04:51.000000 usr/share/zoneinfo/zone.tab
│ │ │ │ │ │ │  drwxrwsr-x   0        0       40        0 2002-02-08 15:42:00.000000 usr/src/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2002-02-08 15:42:00.000000 var/backups/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/apt/archives/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/cache/debconf/
│ │ │ │ │ │ │  -rw-------   0        0        0    34207 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat
│ │ │ │ │ │ │  -rw-------   0        0        0    33335 2017-01-01 00:00:00.000000 var/cache/debconf/config.dat-old
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   284621 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat
│ │ │ │ │ │ │  -rw-r--r--   0        0        0   268070 2017-01-01 00:00:00.000000 var/cache/debconf/templates.dat-old
│ │ │ │ │ │ │  drwxr-sr-x   0        6        0        0 2003-08-16 03:09:17.000000 var/cache/man/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/
│ │ │ │ │ │ │ +drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/apt/lists/partial/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dhcp/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dhcp/dhclient.leases
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/
│ │ │ │ │ │ │  drwxr-xr-x   0        0        0        0 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      208 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/awk
│ │ │ │ │ │ │  -rw-r--r--   0        0        0       96 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/dhcp-options.5.gz
│ │ │ │ │ │ │  -rw-r--r--   0        0        0      173 2017-01-01 00:00:00.000000 var/lib/dpkg/alternatives/editor
│ │ │ │ ├── rootfs.tar.xz.sha256
│ │ │ │ │ @@ -1 +1 @@
│ │ │ │ │ -ecd584f24042295a368e89717f8953383f4883890648b9ba4ca6e2d4c05461e2
│ │ │ │ │ +fc37ee404450d189c3b85adcbad8c840260606665fdbbe3636fdc461ff2da900

# qemu-debootstrap testing
- ARCH=arm64 SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=893efc1b9db1ba2df4f171d4422194a408f9810d3b55d9b0cd66fcc7722f7567
# a few entries for "today" to try and catch issues like https://github.com/debuerreotype/debuerreotype/issues/41 sooner
Expand Down
10 changes: 8 additions & 2 deletions scripts/.tar-exclude
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
./proc/**
./sys/**

./var/cache/apt/**
./var/lib/apt/lists/**
# targeted exclusions to get rid of everything except "/var/cache/apt/archives/partial" and "/var/lib/apt/lists/partial"
# (https://salsa.debian.org/apt-team/apt/commit/1cd1c398d18b78f4aa9d882a5de5385f4538e0be)
./var/cache/apt/*.bin
./var/cache/apt/archives/*.deb
./var/cache/apt/archives/lock
./var/lib/apt/lists/*Packages*
./var/lib/apt/lists/*Release*
./var/lib/apt/lists/lock

# ends up with host-kernel info
./etc/apt/apt.conf.d/01autoremove-kernels
Expand Down
10 changes: 10 additions & 0 deletions scripts/debuerreotype-tar
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ targetTar="${1:-}"; shift || eusage 'missing target-tar'
epoch="$(< "$targetDir/debuerreotype-epoch")"
[ -n "$epoch" ]

aptVersion="$("$thisDir/.apt-version.sh" "$targetDir")"
if dpkg --compare-versions "$aptVersion" '>=' '0.8~'; then
# if APT is new enough to auto-recreate "partial" directories, let it
# (https://salsa.debian.org/apt-team/apt/commit/1cd1c398d18b78f4aa9d882a5de5385f4538e0be)
excludes+=(
'./var/cache/apt/**'
'./var/lib/apt/lists/**'
)
fi

"$thisDir/debuerreotype-fixup" "$targetDir"

tarArgs=(
Expand Down