mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-08 10:52:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #607 from marineam/aufs

Browse Source 
maint(coreos-base/coreos): Drop aufs tools from our images.
This commit is contained in:
Michael Marineau 2014-05-15 15:19:10 -07:00
commit 5484890349
6 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r233.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r234.ebuild vendored
View File

1
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild vendored
View File

@ -132,7 +132,6 @@ RDEPEND="${RDEPEND}
sys-apps/systemd sys-apps/systemd
sys-apps/systemd-sysv-utils sys-apps/systemd-sysv-utils
sys-apps/util-linux sys-apps/util-linux
sys-fs/aufs-util
sys-fs/btrfs-progs sys-fs/btrfs-progs
sys-fs/e2fsprogs sys-fs/e2fsprogs
sys-fs/mdadm sys-fs/mdadm

5
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords vendored
View File

@ -46,9 +46,6 @@
>=sys-apps/kexec-tools-2.0.4-r1 ~amd64 >=sys-apps/kexec-tools-2.0.4-r1 ~amd64
>=sys-kernel/dracut-027-r3 ~amd64 >=sys-kernel/dracut-027-r3 ~amd64
# Needed for docker
=sys-fs/aufs-util-3.7.6 ~amd64
# Needed by gsutil-3.34 # Needed by gsutil-3.34
=dev-python/httplib2-0.8 ~amd64 =dev-python/httplib2-0.8 ~amd64
=dev-python/crcmod-1.7-r1 ~amd64 =dev-python/crcmod-1.7-r1 ~amd64
@ -65,8 +62,6 @@
=app-portage/gentoolkit-0.3.0.8 =app-portage/gentoolkit-0.3.0.8
# Docker dependencies are needed # Docker dependencies are needed
=sys-fs/aufs-util-3* ~amd64
=sys-fs/aufs-headers-3* ~amd64
=dev-util/boost-build-1.52.0-r1 ~amd64 =dev-util/boost-build-1.52.0-r1 ~amd64
# Fixes ruby dependency # Fixes ruby dependency

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided vendored
View File

@ -5,4 +5,3 @@
# even a simple mta (like ssmtp). http://crosbug.com/5777 # even a simple mta (like ssmtp). http://crosbug.com/5777
mail-mta/ssmtp-2.64 mail-mta/ssmtp-2.64
net-mail/mailbase-1 net-mail/mailbase-1
sys-fs/aufs3-9999

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use vendored
View File

@ -39,8 +39,6 @@ app-emulation/qemu aio caps curl jpeg ncurses png python seccomp threads uuid vh
dev-libs/libaio static-libs dev-libs/libaio static-libs
cross-armv7a-cros-linux-gnueabi/gcc hardfp cross-armv7a-cros-linux-gnueabi/gcc hardfp
cross-armv6j-cros-linux-gnueabi/gcc hardfp -thumb cross-armv6j-cros-linux-gnueabi/gcc hardfp -thumb
# we need aufs and bridging in the kernel for docker
sys-kernel/coreos-kernel aufs bridge
# pciutils is required by flashrom / mosys which is required to be statically # pciutils is required by flashrom / mosys which is required to be statically
# compiled to reduce dependency during auto update. # compiled to reduce dependency during auto update.
sys-apps/pciutils static-libs sys-apps/pciutils static-libs

7
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README vendored
View File

@ -1,4 +1,4 @@
The kernel tree is managed in git and is essentially the stable kernel + aufs. The kernel tree is managed in git and is just the latest stable kernel.
To bump to a new version do the following: To bump to a new version do the following:
@ -24,9 +24,6 @@ To bump to a new version do the following:
[remote "stable"] [remote "stable"]
url = https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable url = https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable
fetch = +refs/heads/*:refs/remotes/stable/* fetch = +refs/heads/*:refs/remotes/stable/*
[remote "aufs"]
url = http://git.code.sf.net/p/aufs/aufs3-linux
fetch = +refs/heads/*:refs/remotes/aufs/*
``` ```
3) git fetch --all 3) git fetch --all
@ -35,8 +32,6 @@ To bump to a new version do the following:
4) git reset --hard v3.10.10 4) git reset --hard v3.10.10
5) git pull . aufs/aufs-3.10
5a) apply any coreos-specific patches that are not yet upstream (i.e. 9p patch) 5a) apply any coreos-specific patches that are not yet upstream (i.e. 9p patch)
that happened to be in a previous kernel branch. that happened to be in a previous kernel branch.