Compare commits

..

6 Commits

Author SHA1 Message Date
Michael Hudson-Doyle
9d03006f87 releasing package livecd-rootfs version 2.719.1 2021-05-11 11:35:11 +12:00
Michael Hudson-Doyle
6270e4d7ad Merge branch 'sru-hirsute-lp1926732' into ubuntu/hirsute 2021-05-11 11:34:52 +12:00
Michael Hudson-Doyle
57f126ae4d fix version number for initial SRU 2021-05-11 11:34:36 +12:00
Thomas Bechtold
dc0990939e
add debian/changelog entry 2021-04-30 13:24:00 +02:00
Thomas Bechtold
77d998829a
add configure_oci function and use it in ubuntu-oci
With that, the Dockerfile modifications[0] currently done externally
are done now here. That means that the created rootfs tarball can be
directly used within a Dockerfile to create a container from scratch:

FROM scratch
ADD livecd.ubuntu-oci.rootfs.tar.gz /
CMD ["/bin/bash"]

[0]
https://github.com/tianon/docker-brew-ubuntu-core/blob/master/update.sh

(cherry picked from commit a81972a58b004897bf3e5c14ff371bc2f6b5e4b8)
2021-04-30 13:13:34 +02:00
Thomas Bechtold
3ad6996779
Add new ubuntu-oci project
This is a copy of the ubuntu-base project.
Currently ubuntu-base is used as a base for the docker/OCI container
images. The rootfs tarball that is created with ubuntu-base is
published under [0]. That tarball is used in the FROM statement of the
Dockerfile as base and then a couple of modifications are done inside
of the Dockerfile[1].
The ubuntu-oci project will include the changes that are currently
done in the Dockerfile. With that:

1) a Dockerfile using that tarball will be just a 2 line thing:

   FROM scratch
   ADD ubuntu-hirsute-core-cloudimg-amd64-root.tar.gz /
   CMD ["/bin/bash"]

2) Ubuntu has the full control about the build process of the
docker/OCI container. No external sources (like [1]) need to be
modified anymore.
3) Ubuntu can publish containers without depending on the official
dockerhub containers[2]. Currently the containers for the AWS ECR
registry[3] use as a base[4] the official dockerhub containers. That's
no longer needed because a container just needs a Dockerfile described
in 1)

When the ubuntu-oci project has the modifications from [1] included,
we'll also update [1] to use the ubuntu-oci rootfs tarball as a base
and drop the modifications done at [1].

Note: Creating a new ubuntu-oci project instead of using ubuntu-base
will make sure that we don't break users who are currently using
ubuntu-base rootfs tarballs for doing their own thing.

[0] https://partner-images.canonical.com/core/
[1]
https://github.com/tianon/docker-brew-ubuntu-core/blob/master/update.sh
[2] https://hub.docker.com/_/ubuntu
[3] https://gallery.ecr.aws/ubuntu/ubuntu
[4]
https://launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+oci/ubuntu/+recipe/ubuntu-20.04

(cherry picked from commit ac4a95b9314cf1f8ce01f42016c271c0a6078372)
2021-04-30 13:13:18 +02:00
475 changed files with 3703 additions and 7343 deletions

View File

@ -1,23 +0,0 @@
#!/bin/sh
set -eux
branch=$1
dir=$2
target="$(readlink -f "${3}")"
tmpdir="$(mktemp -d)"
cd "${tmpdir}"
cleanup () {
rm -rf "${tmpdir}"
}
trap cleanup EXIT
mkdir -p $target
git clone $branch checkout
for po in checkout/$dir/*.po; do
msgfmt "${po}" -o "${target}/$(basename "${po}" .po).mo"
done

1
debian/.gitignore vendored
View File

@ -1 +0,0 @@
files

2948
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

21
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,14 +12,12 @@ Depends: ${misc:Depends},
apt-utils, apt-utils,
attr, attr,
debootstrap, debootstrap,
devscripts,
distro-info, distro-info,
dosfstools, dosfstools,
e2fsprogs, e2fsprogs,
gdisk, gdisk,
genisoimage, genisoimage,
germinate (>= 1.25.1), germinate (>= 1.25.1),
gettext,
git, git,
gnupg, gnupg,
grep-dctrl, grep-dctrl,
@ -30,25 +26,22 @@ Depends: ${misc:Depends},
lsb-release, lsb-release,
lzma, lzma,
make, make,
mount,
mtools [!i386],
parted, parted,
procps, procps,
python3, python3,
python3-apt, python3-apt,
python3-launchpadlib [!i386], python3-launchpadlib,
python3-yaml, python3-yaml,
qemu-utils [!i386], qemu-utils [!i386],
rsync [!i386], rsync,
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],
xz-utils, xz-utils,
zerofree, zerofree
zstd
Breaks: ubuntu-defaults-builder (<< 0.32) Breaks: ubuntu-defaults-builder (<< 0.32)
Description: construction script for the livecd rootfs Description: construction script for the livecd rootfs
livecd-rootfs provides the script used to create the root filesystem livecd-rootfs provides the script used to create the root filesystem

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

5
debian/install vendored
View File

@ -2,6 +2,5 @@ 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
checkout-translations-branch usr/share/livecd-rootfs magic-proxy usr/share/livecd-rootfs
update-source-catalog usr/share/livecd-rootfs lp-in-release 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

@ -13,41 +13,41 @@ fi
# Listed subprojects can be combined with other projects as well, # Listed subprojects can be combined with other projects as well,
# but this list gives reasonable coverage. # but this list gives reasonable coverage.
ALL_TRIPLETS=" ALL_TRIPLETS="
base::
edubuntu:: edubuntu::
edubuntu-dvd::
kubuntu:: kubuntu::
kubuntu-active::
kubuntu-dvd::
kubuntu-plasma5::
lubuntu:: lubuntu::
ubuntu-unity:: mythbuntu::
ubuntu:: ubuntu::
ubuntu:canary:
ubuntu-base:: ubuntu-base::
ubuntu-base:buildd: ubuntu-base:buildd:
ubuntu-budgie:: ubuntu-budgie::
ubuntu-budgie-desktop:: ubuntu-budgie-desktop::
ubuntu-budgie-live:: ubuntu-budgie-live::
ubuntucinnamon::
ubuntu-core:system-image:ubuntu-core ubuntu-core:system-image:ubuntu-core
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-server:live:ubuntu-server ubuntu-netbook::
xubuntu:: ubuntu-server::
xubuntu:minimal:" xubuntu::"
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