Compare commits

..

8 Commits

Author SHA1 Message Date
Philip Roche
13c53acd0e Fix d/ch formatting for 2.828.2 2023-10-27 11:41:22 +01:00
Philip Roche
df428ae77a Merge bugfix/ubuntu-cpc-LP-2036195-auto-installed-packages-lunar into ubuntu/lunar [a=philroche] [r=andrew-cloke,vorlon]
The chroot tmpfs mount should only be /var/lib/apt/lists, not /var/lib/apt; the latter breaks changes to /var/lib/apt/extended_states. LP: #2036195.

(cherry picked from commit 1deccc2edd7f139b84a6cb3d0a4dfe5ebaff50c7)

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/454058
2023-10-26 17:59:33 +01:00
Steve Langasek
cf7b3c5b36 The chroot tmpfs mount should only be /var/lib/apt/lists, not /var/lib/apt; the latter breaks changes to /var/lib/apt/extended_states. LP: #2036195.
(cherry picked from commit 1deccc2edd7f139b84a6cb3d0a4dfe5ebaff50c7)

# Conflicts:
#	debian/changelog
2023-10-26 17:41:15 +01:00
Utkarsh Gupta
af29243117 Fix d/ch to start the SRU series from 2.828 -> 2.828.1 2023-10-26 15:21:54 +01:00
Philip Roche
73d0477aa7 Merge utkarsh-lunar-sru-1996489 into ubuntu/lunar [a=utkarsh] [r=andrew-cloke,philroche]
Fix unminimize to correctly list packages (LP: #1996489)

    Prior to dpkg/1.21.0, there was a bug where dpkg -V/--verify
    couldn't list all the correct packages correctly but with
    that being fix and in archive since Jammy, this works perfectly
    but the syntax to report the missing files have changed. It
    just prints 'missing' now. With that new format, we can now
    fix the regex to simply list the packages.

    With this patch, the unminimize script works flawlessly
    on a minimized image.

    (cherry picked from commit 78a98c683573a1f7983afae54e2f187eeae127c7)

    ---

    fix: install LXD snap from stable/ubuntu-<version> channel (LP: #2036725)

    In the past, we'd directly snap install lxd which defaults to
    the latest/stable channel. However, whilst working on enhancing
    unminimize, it was observed that we install this snap from
    the stable/ubuntu-<version> channel instead.

    This was also noted as a failure when running the CTF tests:
    `lxd installed from latest/stable, not stable/ubuntu-23.10`

    (cherry picked from commit 12a2109c223e261214747d5f98d4b8d7ee9625e3)

MP: https://code.launchpad.net/~utkarsh/livecd-rootfs/+git/livecd-rootfs/+merge/452739
2023-10-26 13:34:10 +01:00
Utkarsh Gupta
22f8d6a79f Update d/ch for 2.829 release 2023-10-04 13:43:24 +05:30
Utkarsh Gupta
0c728eb1a9 fix: install LXD snap from stable/ubuntu-<version> channel (LP: #2036725)
In the past, we'd directly snap install lxd which defaults to
the latest/stable channel. However, whilst working on enhancing
unminimize, it was observed that we install this snap from
the stable/ubuntu-<version> channel instead.

This was also noted as a failure when running the CTF tests:
`lxd installed from latest/stable, not stable/ubuntu-23.10`

(cherry picked from commit 12a2109c223e261214747d5f98d4b8d7ee9625e3)
2023-10-04 13:41:08 +05:30
Utkarsh Gupta
38efc28bfb Fix unminimize to correctly list packages (LP: #1996489)
Prior to dpkg/1.21.0, there was a bug where dpkg -V/--verify
couldn't list all the correct packages correctly but with
that being fix and in archive since Jammy, this works perfectly
but the syntax to report the missing files have changed. It
just prints 'missing' now. With that new format, we can now
fix the regex to simply list the packages.

With this patch, the unminimize script works flawlessly
on a minimized image.

(cherry picked from commit 78a98c683573a1f7983afae54e2f187eeae127c7)
2023-10-04 13:40:45 +05:30
397 changed files with 3240 additions and 5175 deletions

1
debian/.gitignore vendored
View File

@ -1 +0,0 @@
files

1990
debian/changelog vendored

File diff suppressed because it is too large Load Diff

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
7

12
debian/control vendored
View File

@ -1,12 +1,10 @@
Source: livecd-rootfs Source: livecd-rootfs
Section: devel Section: devel
Priority: optional Priority: optional
Build-Depends: debhelper-compat (= 13) Build-Depends: debhelper (>= 7)
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Standards-Version: 4.7.0 Standards-Version: 3.9.6
Vcs-Git: https://git.launchpad.net/livecd-rootfs -b ubuntu/master Vcs-Git: https://git.launchpad.net/livecd-rootfs -b ubuntu/master
Vcs-Browser: https://git.launchpad.net/livecd-rootfs
Rules-Requires-Root: no
Package: livecd-rootfs Package: livecd-rootfs
Architecture: any Architecture: any
@ -14,7 +12,6 @@ Depends: ${misc:Depends},
apt-utils, apt-utils,
attr, attr,
debootstrap, debootstrap,
devscripts,
distro-info, distro-info,
dosfstools, dosfstools,
e2fsprogs, e2fsprogs,
@ -30,8 +27,6 @@ Depends: ${misc:Depends},
lsb-release, lsb-release,
lzma, lzma,
make, make,
mount,
mtools [!i386],
parted, parted,
procps, procps,
python3, python3,
@ -43,7 +38,8 @@ Depends: ${misc:Depends},
snapd (>= 2.39) [!i386], snapd (>= 2.39) [!i386],
squashfs-tools (>= 1:3.3-1), squashfs-tools (>= 1:3.3-1),
sudo, sudo,
u-boot-tools [arm64 armhf], u-boot-tools [armhf arm64],
ubuntu-image [!i386 !riscv64],
python3-vmdkstream [amd64 i386], python3-vmdkstream [amd64 i386],
xorriso [!i386], xorriso [!i386],
xz-utils, xz-utils,

2
debian/copyright vendored
View File

@ -11,7 +11,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details. General Public License for more details.
You should have received a copy of the GNU General Public License with You should have received a copy of the GNU General Public License with
your Ubuntu system, in /usr/share/common-licenses/GPL-2, or with the your Ubuntu system, in /usr/share/common-licenses/GPL, or with the
livecd-rootfs source package as the file COPYING. If not, write to livecd-rootfs source package as the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA. Boston, MA 02110-1301 USA.

1
debian/gbp.conf vendored
View File

@ -1,4 +1,3 @@
[DEFAULT] [DEFAULT]
debian-branch=ubuntu/master debian-branch=ubuntu/master
debian-tag = %(version)s debian-tag = %(version)s
dch-opt = --vendor=debian

3
debian/install vendored
View File

@ -2,6 +2,7 @@ auto-markable-pkgs usr/share/livecd-rootfs
live-build usr/share/livecd-rootfs live-build usr/share/livecd-rootfs
get-ppa-fingerprint usr/share/livecd-rootfs get-ppa-fingerprint usr/share/livecd-rootfs
minimize-manual usr/share/livecd-rootfs minimize-manual usr/share/livecd-rootfs
magic-proxy usr/share/livecd-rootfs
lp-in-release usr/share/livecd-rootfs
checkout-translations-branch usr/share/livecd-rootfs checkout-translations-branch usr/share/livecd-rootfs
update-source-catalog usr/share/livecd-rootfs update-source-catalog usr/share/livecd-rootfs
sync-mtime usr/share/livecd-rootfs

View File

@ -1,10 +0,0 @@
# This is expected and okay
livecd-rootfs: service-file-is-not-a-file [usr/share/livecd-rootfs/*.service]
livecd-rootfs: uses-dpkg-database-directly [usr/share/livecd-rootfs/live-build/lb_chroot_layered]
livecd-rootfs: package-contains-no-arch-dependent-files
# Developer documentation in an already-expected spot
livecd-rootfs: package-contains-documentation-outside-usr-share-doc [usr/share/livecd-rootfs/live-build/ubuntu-cpc/README.cpc.md]
# This is going to occur quite a bit; we're making a livefs
livecd-rootfs: repeated-path-segment * [*]

View File

@ -1,5 +0,0 @@
# This is expected and okay
livecd-rootfs source: absolute-symbolic-link-target-in-source * [live-build/*]
# The description indicates that it's not required in debhelper >= 13, which we have
livecd-rootfs source: override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS [debian/rules:*]

View File

@ -1,7 +1,7 @@
Tests: default-bootstraps Tests: default-bootstraps
Depends: @, lsb-release Depends: @, lsb-release
Restrictions: needs-root isolation-machine allow-stderr Restrictions: needs-root isolation-machine
Tests: minimized Tests: minimized
Depends: @, lsb-release Depends: @, lsb-release
Restrictions: needs-root isolation-machine allow-stderr Restrictions: needs-root isolation-machine

View File

@ -15,9 +15,13 @@ fi
ALL_TRIPLETS=" ALL_TRIPLETS="
edubuntu:: edubuntu::
kubuntu:: kubuntu::
kubuntu-dvd::
kubuntu-plasma5::
lubuntu:: lubuntu::
ubuntu-unity:: ubuntu-unity::
mythbuntu::
ubuntu:: ubuntu::
ubuntu:legacy:
ubuntu-base:: ubuntu-base::
ubuntu-base:buildd: ubuntu-base:buildd:
ubuntu-budgie:: ubuntu-budgie::
@ -28,26 +32,22 @@ ALL_TRIPLETS="
ubuntu-cpc::ubuntu-cpc ubuntu-cpc::ubuntu-cpc
ubuntu-cpc:minimized:ubuntu-cpc ubuntu-cpc:minimized:ubuntu-cpc
ubuntu-dvd:: ubuntu-dvd::
ubuntu-gnome::
ubuntukylin:: ubuntukylin::
ubuntu-mate:: ubuntu-mate::
ubuntu-mate-core:: ubuntu-mate-core::
ubuntu-mate-desktop:: ubuntu-mate-desktop::
ubuntu-mate-live:: ubuntu-mate-live::
ubuntu-netbook::
ubuntu-server:live:ubuntu-server ubuntu-server:live:ubuntu-server
xubuntu:: xubuntu::
xubuntu:minimal:" xubuntu:minimal:"
ARCH=$(dpkg --print-architecture)
if [ -z "$SELECTED_TRIPLETS" ]; then if [ -z "$SELECTED_TRIPLETS" ]; then
SELECTED_TRIPLETS=" SELECTED_TRIPLETS="
ubuntu-base:: ubuntu-base::
ubuntu-cpc::ubuntu-cpc ubuntu-cpc::ubuntu-cpc
" "
if [ "$ARCH" = amd64 ]; then
SELECTED_TRIPLETS="$SELECTED_TRIPLETS
ubuntu::"
fi
fi fi
live_build_rootfs() { live_build_rootfs() {
@ -55,6 +55,7 @@ live_build_rootfs() {
local SUBPROJECT_TMP=${1%:*} local SUBPROJECT_TMP=${1%:*}
SUBPROJECT=${SUBPROJECT_TMP#*:} SUBPROJECT=${SUBPROJECT_TMP#*:}
TEMPLATE=${1##*:} TEMPLATE=${1##*:}
ARCH=$(dpkg --print-architecture)
echo "Building rootfs for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD" echo "Building rootfs for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
cp -a /usr/share/livecd-rootfs/live-build/auto . cp -a /usr/share/livecd-rootfs/live-build/auto .
if [ -n "$TEMPLATE" ]; then if [ -n "$TEMPLATE" ]; then
@ -64,22 +65,19 @@ live_build_rootfs() {
SUBPROJECT=$SUBPROJECT \ SUBPROJECT=$SUBPROJECT \
SUITE=$SUITE \ SUITE=$SUITE \
ARCH=$ARCH \ ARCH=$ARCH \
NOW=$(date '+%Y%m%d') \
lb config lb config
mkdir chroot mkdir chroot
# this part needs root rights, but right now the whole script ran as root by autopkgtest # this part needs root rights, but right now the whole script ran as root by autopkgtest
env PROJECT=$PROJECT \ env PROJECT=$PROJECT \
SUBPROJECT=$SUBPROJECT \ SUBPROJECT=$SUBPROJECT \
ARCH=$ARCH \ ARCH=$ARCH \
NOW=$(date '+%Y%m%d') \
lb build lb build
echo "Build results for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD" echo "Build results for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
du -sh * du -sh *
echo "" echo ""
} }
[ -d /adt ] || mkdir /adt WORKDIR=$(mktemp -d)
WORKDIR=$(mktemp -d -p /adt)
trap "RET=\$?; rm -rf $WORKDIR; exit \$RET" 0 INT QUIT ABRT PIPE TERM trap "RET=\$?; rm -rf $WORKDIR; exit \$RET" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR cd $WORKDIR

View File

@ -1 +0,0 @@
0xffffff

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read perfmon bpf checkpoint_restore

View File

@ -1 +0,0 @@
acquire send receive

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
1.2

View File

@ -1 +0,0 @@
create read write exec append mmap_exec link lock

View File

@ -1 +0,0 @@
sqpoll override_creds

View File

@ -1 +0,0 @@
create read write open delete setattr getattr

View File

@ -1 +0,0 @@
mount umount pivot_root

View File

@ -1 +0,0 @@
detached

View File

@ -1 +0,0 @@
userns_create

View File

@ -1 +0,0 @@
no

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
pciu&

View File

@ -1 +0,0 @@
unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp

View File

@ -1 +0,0 @@
file

View File

@ -1 +0,0 @@
0x000001

View File

@ -1 +0,0 @@
allow deny subtree cond kill complain prompt audit quiet hide xindex tag label

View File

@ -1 +0,0 @@
0x000003

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
0x000001

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
read trace

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
allow deny audit quiet

View File

@ -1 +0,0 @@
cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime

View File

@ -1 +0,0 @@
hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost

View File

@ -1 +0,0 @@
0xffffff

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read perfmon bpf checkpoint_restore

View File

@ -1 +0,0 @@
acquire send receive

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
1.2

View File

@ -1 +0,0 @@
create read write exec append mmap_exec link lock

View File

@ -1 +0,0 @@
sqpoll override_creds

View File

@ -1 +0,0 @@
create read write open delete setattr getattr

View File

@ -1 +0,0 @@
mount umount pivot_root

View File

@ -1 +0,0 @@
detached

View File

@ -1 +0,0 @@
userns_create

View File

@ -1 +0,0 @@
no

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
pciu&

View File

@ -1 +0,0 @@
unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp

View File

@ -1 +0,0 @@
file

View File

@ -1 +0,0 @@
0x000001

View File

@ -1 +0,0 @@
allow deny subtree cond kill complain prompt audit quiet hide xindex tag label

View File

@ -1 +0,0 @@
0x000003

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
0x000001

Some files were not shown because too many files have changed in this diff Show More