[Emdebian-logs] [polystrap] branch master updated (ba4fcd6 -> 7dcf15a)

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch-guest pushed a change to branch master
in repository polystrap.

      from  ba4fcd6   add TODO item
       new  acfcacd   add proot support
       new  a8efd2d   add beagleboard, minimal, routerstationpro
       new  7dcf15a   resolve conflict

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 {goldel-gta04 => beagleboard}/config               |  0
 {default => beagleboard}/debconfseed.txt           |  0
 {goldel-gta04 => beagleboard}/hooks/create_user    |  0
 {goldel-gta04 => beagleboard}/hooks/empty_password |  0
 {goldel-gta04 => beagleboard}/hooks/firstboot      |  0
 {kirkwood => beagleboard}/hooks/serial_tty         |  0
 beagleboard/multistrap.conf                        | 31 +++++++++++++
 {goldel-gta04 => beagleboard}/packages/base        |  0
 {goldel-gta04 => beagleboard}/packages/bluez       |  0
 {goldel-gta04 => beagleboard}/packages/e17         |  0
 {goldel-gta04 => beagleboard}/packages/net         |  0
 {goldel-gta04 => beagleboard}/packages/omap3       |  0
 {goldel-gta04 => beagleboard}/packages/wlan        |  0
 {goldel-gta04 => beagleboard}/packages/xorg        |  0
 .../etc/apt/apt.conf.d/99no-install-recommends     |  0
 .../root/etc/apt/apt.conf.d/99no-pdiffs            |  0
 {goldel-gta04 => beagleboard}/root/etc/fstab       |  0
 beagleboard/root/etc/hostname                      |  1 +
 beagleboard/root/etc/hosts                         |  2 +
 {goldel-gta04 => beagleboard}/root/etc/ld.so.conf  |  0
 {goldel-gta04 => beagleboard}/root/etc/modules     |  0
 .../root/etc/network/interfaces                    |  0
 .../root/etc/ssh/ssh_host_dsa_key                  |  0
 .../root/etc/ssh/ssh_host_ecdsa_key                |  0
 .../root/etc/ssh/ssh_host_rsa_key                  |  0
 .../root/usr/sbin/policy-rc.d                      |  0
 default/hooks/firstboot                            | 15 +++---
 {default => minimal}/config                        |  0
 {default => minimal}/debconfseed.txt               |  0
 {default => minimal}/hooks/create_user             |  0
 {default => minimal}/hooks/empty_password          |  0
 {default => minimal}/hooks/firstboot               |  1 -
 {default => minimal}/hooks/serial_tty              |  0
 {default => minimal}/multistrap.conf               |  0
 {default => minimal}/packages/base                 |  0
 {default => minimal}/packages/net                  |  0
 .../etc/apt/apt.conf.d/99no-install-recommends     |  0
 .../root/etc/apt/apt.conf.d/99no-pdiffs            |  0
 {default => minimal}/root/etc/fstab                |  0
 {default => minimal}/root/etc/hostname             |  0
 {default => minimal}/root/etc/hosts                |  0
 {default => minimal}/root/etc/ld.so.conf           |  0
 {default => minimal}/root/etc/network/interfaces   |  0
 {default => minimal}/root/etc/ssh/ssh_host_dsa_key |  0
 .../root/etc/ssh/ssh_host_ecdsa_key                |  0
 {default => minimal}/root/etc/ssh/ssh_host_rsa_key |  0
 {default => minimal}/root/usr/sbin/policy-rc.d     |  0
 polystrap.sh                                       | 53 ++++++++++++----------
 {goldel-gta04 => routerstationpro}/config          |  4 +-
 {default => routerstationpro}/debconfseed.txt      |  0
 .../hooks/create_user                              |  0
 .../hooks/empty_password                           |  0
 {goldel-gta04 => routerstationpro}/hooks/firstboot |  0
 {kirkwood => routerstationpro}/hooks/serial_tty    |  0
 {default => routerstationpro}/multistrap.conf      |  2 +-
 {goldel-gta04 => routerstationpro}/packages/base   |  0
 routerstationpro/packages/qt4                      |  3 ++
 .../etc/apt/apt.conf.d/99no-install-recommends     |  0
 .../root/etc/apt/apt.conf.d/99no-pdiffs            |  0
 {default => routerstationpro}/root/etc/fstab       |  0
 routerstationpro/root/etc/hostname                 |  1 +
 routerstationpro/root/etc/hosts                    |  2 +
 .../root/etc/ld.so.conf                            |  0
 .../root/etc/network/interfaces                    |  0
 .../root/etc/ssh/ssh_host_dsa_key                  |  0
 .../root/etc/ssh/ssh_host_ecdsa_key                |  0
 .../root/etc/ssh/ssh_host_rsa_key                  |  0
 .../root/usr/sbin/policy-rc.d                      |  0
 68 files changed, 78 insertions(+), 37 deletions(-)
 copy {goldel-gta04 => beagleboard}/config (100%)
 copy {default => beagleboard}/debconfseed.txt (100%)
 copy {goldel-gta04 => beagleboard}/hooks/create_user (100%)
 copy {goldel-gta04 => beagleboard}/hooks/empty_password (100%)
 copy {goldel-gta04 => beagleboard}/hooks/firstboot (100%)
 copy {kirkwood => beagleboard}/hooks/serial_tty (100%)
 create mode 100644 beagleboard/multistrap.conf
 copy {goldel-gta04 => beagleboard}/packages/base (100%)
 copy {goldel-gta04 => beagleboard}/packages/bluez (100%)
 copy {goldel-gta04 => beagleboard}/packages/e17 (100%)
 copy {goldel-gta04 => beagleboard}/packages/net (100%)
 copy {goldel-gta04 => beagleboard}/packages/omap3 (100%)
 copy {goldel-gta04 => beagleboard}/packages/wlan (100%)
 copy {goldel-gta04 => beagleboard}/packages/xorg (100%)
 copy {goldel-gta04 => beagleboard}/root/etc/apt/apt.conf.d/99no-install-recommends (100%)
 copy {goldel-gta04 => beagleboard}/root/etc/apt/apt.conf.d/99no-pdiffs (100%)
 copy {goldel-gta04 => beagleboard}/root/etc/fstab (100%)
 create mode 100644 beagleboard/root/etc/hostname
 create mode 100644 beagleboard/root/etc/hosts
 copy {goldel-gta04 => beagleboard}/root/etc/ld.so.conf (100%)
 copy {goldel-gta04 => beagleboard}/root/etc/modules (100%)
 copy {goldel-gta04 => beagleboard}/root/etc/network/interfaces (100%)
 copy {goldel-gta04 => beagleboard}/root/etc/ssh/ssh_host_dsa_key (100%)
 copy {goldel-gta04 => beagleboard}/root/etc/ssh/ssh_host_ecdsa_key (100%)
 copy {goldel-gta04 => beagleboard}/root/etc/ssh/ssh_host_rsa_key (100%)
 copy {goldel-gta04 => beagleboard}/root/usr/sbin/policy-rc.d (100%)
 copy {default => minimal}/config (100%)
 copy {default => minimal}/debconfseed.txt (100%)
 copy {default => minimal}/hooks/create_user (100%)
 copy {default => minimal}/hooks/empty_password (100%)
 copy {default => minimal}/hooks/firstboot (94%)
 copy {default => minimal}/hooks/serial_tty (100%)
 copy {default => minimal}/multistrap.conf (100%)
 copy {default => minimal}/packages/base (100%)
 copy {default => minimal}/packages/net (100%)
 copy {default => minimal}/root/etc/apt/apt.conf.d/99no-install-recommends (100%)
 copy {default => minimal}/root/etc/apt/apt.conf.d/99no-pdiffs (100%)
 copy {default => minimal}/root/etc/fstab (100%)
 copy {default => minimal}/root/etc/hostname (100%)
 copy {default => minimal}/root/etc/hosts (100%)
 copy {default => minimal}/root/etc/ld.so.conf (100%)
 copy {default => minimal}/root/etc/network/interfaces (100%)
 copy {default => minimal}/root/etc/ssh/ssh_host_dsa_key (100%)
 copy {default => minimal}/root/etc/ssh/ssh_host_ecdsa_key (100%)
 copy {default => minimal}/root/etc/ssh/ssh_host_rsa_key (100%)
 copy {default => minimal}/root/usr/sbin/policy-rc.d (100%)
 copy {goldel-gta04 => routerstationpro}/config (50%)
 copy {default => routerstationpro}/debconfseed.txt (100%)
 copy {goldel-gta04 => routerstationpro}/hooks/create_user (100%)
 copy {goldel-gta04 => routerstationpro}/hooks/empty_password (100%)
 copy {goldel-gta04 => routerstationpro}/hooks/firstboot (100%)
 copy {kirkwood => routerstationpro}/hooks/serial_tty (100%)
 copy {default => routerstationpro}/multistrap.conf (88%)
 copy {goldel-gta04 => routerstationpro}/packages/base (100%)
 create mode 100644 routerstationpro/packages/qt4
 copy {goldel-gta04 => routerstationpro}/root/etc/apt/apt.conf.d/99no-install-recommends (100%)
 copy {goldel-gta04 => routerstationpro}/root/etc/apt/apt.conf.d/99no-pdiffs (100%)
 copy {default => routerstationpro}/root/etc/fstab (100%)
 create mode 100644 routerstationpro/root/etc/hostname
 create mode 100644 routerstationpro/root/etc/hosts
 copy {goldel-gta04 => routerstationpro}/root/etc/ld.so.conf (100%)
 copy {default => routerstationpro}/root/etc/network/interfaces (100%)
 copy {goldel-gta04 => routerstationpro}/root/etc/ssh/ssh_host_dsa_key (100%)
 copy {goldel-gta04 => routerstationpro}/root/etc/ssh/ssh_host_ecdsa_key (100%)
 copy {goldel-gta04 => routerstationpro}/root/etc/ssh/ssh_host_rsa_key (100%)
 copy {goldel-gta04 => routerstationpro}/root/usr/sbin/policy-rc.d (100%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/emdebian/polystrap.git