commit lxc for openSUSE:Factory
Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2013-02-25 21:40:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxc", Maintainer is "JSlaby@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2013-02-19 16:19:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2013-02-25 21:40:49.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 20 16:21:03 UTC 2013 - fcrozat@suse.com + +- Add lxc-opensuse-12.3.patch: update template to openSUSE 12.3 + +------------------------------------------------------------------- New: ---- lxc-opensuse-12.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.feGwQv/_old 2013-02-25 21:40:50.000000000 +0100 +++ /var/tmp/diff_new_pack.feGwQv/_new 2013-02-25 21:40:50.000000000 +0100 @@ -41,8 +41,12 @@ Patch6: pivot-root_shared.patch # PATCH-FIX-UPSTREAM lxc-autodev.patch fcrozat@suse.com -- Add lxc.autodev Patch7: lxc-autodev.patch +# PATCH-FIX-OPENSUSE lxc-opensuse-extend-base.patch jslaby@suse.com -- Add missing package to base Patch8: lxc-opensuse-extend-base.patch +# PATCH-FIX-OPENSUSE lxc-opensuse-proper-failure.patch jslaby@suse.com -- Proper failure on repository addition error Patch9: lxc-opensuse-proper-failure.patch +# PATCH-FIX-OPENSUSE lxc-opensuse-12.3.patch fcrozat@suse.com -- Switch openSUSE template to 12.3 +Patch10: lxc-opensuse-12.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils @@ -92,6 +96,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build %configure --disable-examples ++++++ lxc-opensuse-12.3.patch ++++++ Index: lxc-0.8.0/templates/lxc-opensuse.in =================================================================== --- lxc-0.8.0.orig/templates/lxc-opensuse.in +++ lxc-0.8.0/templates/lxc-opensuse.in @@ -25,7 +25,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -DISTRO=12.2 +DISTRO=12.3 configure_opensuse() { @@ -58,7 +58,6 @@ EOF 127.0.0.1 localhost $hostname EOF - # disable various services # disable yast->bootloader in container cat <<EOF > $rootfs/etc/sysconfig/bootloader LOADER_TYPE=none @@ -81,7 +80,14 @@ EOF ln -s /dev/null $rootfs/etc/systemd/system/proc-sys-fs-binfmt_misc.automount ln -s /dev/null $rootfs/etc/systemd/system/console-shell.service ln -s /dev/null $rootfs/etc/systemd/system/systemd-vconsole-setup.service - ln -s /lib/systemd/system/getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@console.service + sed -e 's/ConditionPathExists=.*//' /usr/lib/systemd/system/getty@.service > $rootfs/etc/systemd/system/getty@.service + ln -s getty@.service $rootfs/etc/systemd/system/getty@tty1.service + ln -s ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@console.service + ln -s -f ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@tty1.service + ln -s ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@tty2.service + ln -s ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@tty3.service + ln -s ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@tty4.service + touch $rootfs/etc/sysconfig/kernel @@ -116,12 +122,12 @@ download_opensuse() zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1 zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1 zypper --quiet --root $cache/partial-$arch-packages --non-interactive --gpg-auto-import-keys update || return 1 - zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar || return 1 + zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar rsyslog || return 1 cat > $cache/partial-$arch-packages/opensuse.conf << EOF Preinstall: aaa_base bash coreutils diffutils -Preinstall: filesystem fillup glibc grep insserv -Preinstall: libbz2-1 libgcc47 libncurses5 pam -Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1 +Preinstall: filesystem fillup glibc grep insserv-compat +Preinstall: libbz2-1 libgcc_s1 libncurses5 pam +Preinstall: permissions libreadline6 rpm sed tar libz1 libselinux1 Preinstall: liblzma5 libcap2 libacl1 libattr1 Preinstall: libpopt0 libelf1 liblua5_1 Preinstall: libpcre1 @@ -135,8 +141,8 @@ Support: ncurses-utils Support: iputils Support: udev Support: netcfg -Support: dhcpcd hwinfo insserv module-init-tools openSUSE-release openssh -Support: pwdutils rpcbind sysconfig rsyslog +Support: dhcpcd hwinfo insserv-compat module-init-tools openSUSE-release openssh +Support: pwdutils rpcbind sysconfig Ignore: rpm:suse-build-key,build-key Ignore: systemd:systemd-presets-branding -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de