From 0a87d47748f02b0f1d64d5cc2722ea94d1a64143 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 15 Sep 2017 19:48:58 +0300 Subject: [PATCH] p7.mk, t7.mk: drop completely These branches are officially unsupported for the whole two years, probably just the time to clean up. See-also: http://altlinux.org/branches --- conf.d/p7.mk | 49 ------------------------------------------------- conf.d/t7.mk | 13 ------------- 2 files changed, 62 deletions(-) delete mode 100644 conf.d/p7.mk delete mode 100644 conf.d/t7.mk diff --git a/conf.d/p7.mk b/conf.d/p7.mk deleted file mode 100644 index 9e027e72..00000000 --- a/conf.d/p7.mk +++ /dev/null @@ -1,49 +0,0 @@ -# p7 base kits - -mixin/p7: use/browser/firefox/esr - @$(call set,BRANDING,altlinux-starterkit) - @$(call set,IMAGE_FLAVOUR,$(subst altlinux-p7-,,$(IMAGE_NAME))) - @$(call set,META_VOL_ID,ALT Linux p7 $$(IMAGE_FLAVOUR)/$(ARCH)) - -ifeq (distro,$(IMAGE_CLASS)) - -### kludge compatibility: introspection stub for main.mk :-/ -distro/altlinux-p7-cinnamon: distro/regular-cinnamon mixin/p7; @: -distro/altlinux-p7-e17: distro/regular-e17 mixin/p7; @: -distro/altlinux-p7-icewm: distro/regular-icewm mixin/p7; @: -distro/altlinux-p7-gnome3: distro/regular-gnome3 mixin/p7; @: -distro/altlinux-p7-gnustep: distro/regular-gnustep mixin/p7; @: -distro/altlinux-p7-kde4: distro/regular-kde4 mixin/p7; @: -distro/altlinux-p7-lxde: distro/regular-lxde mixin/p7; @: -distro/altlinux-p7-lxqt: distro/regular-lxqt mixin/p7; @: -distro/altlinux-p7-lxqt-sysv: distro/regular-lxqt-sysv mixin/p7; @: -distro/altlinux-p7-mate: distro/regular-mate mixin/p7; @: -distro/altlinux-p7-rescue: distro/regular-rescue mixin/p7; @: -distro/altlinux-p7-tde: distro/regular-tde mixin/p7; @: -distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @: -distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @: -distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @: -distro/altlinux-p7-xfce-sysv: distro/regular-xfce-sysv mixin/p7; @: - -distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @: - -distro/altlinux-p7-jeos: distro/regular-jeos mixin/p7; @: -distro/altlinux-p7-jeos-ovz: distro/regular-jeos-ovz mixin/p7; @: -distro/altlinux-p7-server: distro/regular-server mixin/p7; @: -distro/altlinux-p7-server-ovz: distro/regular-server-ovz mixin/p7; @: -distro/altlinux-p7-server-hyperv: distro/regular-server-hyperv mixin/p7; @: -distro/altlinux-p7-server-samba4: distro/regular-server-samba4 mixin/p7; @: - -distro/altlinux-p7-builder: distro/regular-builder mixin/p7; @: - -endif - -ifeq (ve,$(IMAGE_CLASS)) -ve/altlinux-p7-ovz-generic: ve/generic mixin/p7; @: -ve/altlinux-p7-ovz-pgsql94: ve/pgsql94 mixin/p7; @: -endif - -ifeq (vm,$(IMAGE_CLASS)) -vm/altlinux-p7-vm-net: vm/net mixin/p7; @: -vm/altlinux-p7-vagrant: vm/vagrant-base mixin/p7; @: -endif diff --git a/conf.d/t7.mk b/conf.d/t7.mk deleted file mode 100644 index 68cae559..00000000 --- a/conf.d/t7.mk +++ /dev/null @@ -1,13 +0,0 @@ -# t7 base kits - -mixin/t7: - @$(call set,BRANDING,altlinux-starterkit) ### needs changing - -ifeq (distro,$(IMAGE_CLASS)) - -distro/altlinux-t7-gnustep: distro/regular-gnustep mixin/t7; @: -distro/altlinux-t7-gnustep-systemd: distro/regular-gnustep-systemd mixin/t7; @: -distro/altlinux-t7-tde: distro/regular-tde mixin/t7; @: -distro/altlinux-t7-sysv-tde: distro/regular-sysv-tde mixin/t7; @: - -endif