Compare commits
27 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
3f85ed2b19 | ||
|
a07959e2f5 | ||
|
af6b9940de | ||
|
71f44090c5 | ||
|
872afb3c0c | ||
|
191388d7cf | ||
|
70f2a70fca | ||
|
dc9b706619 | ||
|
50c27a1782 | ||
|
3aaa45dd23 | ||
|
a0af945d7f | ||
|
a681b4bd98 | ||
|
b7a395c012 | ||
|
a8e70fd4e6 | ||
|
cff036c212 | ||
|
482e7bc9f3 | ||
|
e1ef65b410 | ||
|
a62cdfa69e | ||
|
045ae269b2 | ||
|
345319805d | ||
|
9c6824ea57 | ||
|
62ab13cc77 | ||
|
4355f401db | ||
|
3dd020338b | ||
|
402b6e080b | ||
|
ca67a20952 | ||
|
5c5c4a6a6b |
@@ -1,5 +1,5 @@
|
||||
Name: mkimage-profiles
|
||||
Version: 0.5.5
|
||||
Version: 0.5.7
|
||||
Release: alt1
|
||||
|
||||
Summary: ALT Linux based distribution metaprofile
|
||||
@@ -59,6 +59,12 @@ cp -a * %buildroot%mpdir
|
||||
%doc README QUICKSTART
|
||||
|
||||
%changelog
|
||||
* Mon Mar 12 2012 Michael Shigorin <mike@altlinux.org> 0.5.7-alt1
|
||||
- distro tweaks
|
||||
|
||||
* Mon Feb 20 2012 Michael Shigorin <mike@altlinux.org> 0.5.6-alt1
|
||||
- minor fixups
|
||||
|
||||
* Mon Feb 06 2012 Michael Shigorin <mike@altlinux.org> 0.5.5-alt1
|
||||
- live-related tweaks (including live.hooks support)
|
||||
- terminal server and webkiosk images
|
||||
|
6
.gear/tags/5f2dbc6d511b0a0a39799983df054a249298dd8c
Normal file
6
.gear/tags/5f2dbc6d511b0a0a39799983df054a249298dd8c
Normal file
@@ -0,0 +1,6 @@
|
||||
object a8e70fd4e667a95fb429c3b77a2f45eca0da7859
|
||||
type commit
|
||||
tag v0.5.6
|
||||
tagger Michael Shigorin <mike@altlinux.org> 1329770647 +0200
|
||||
|
||||
fixups
|
@@ -1,6 +0,0 @@
|
||||
object 8473fda02d9c0e194ac54a95159ebf49df8a0ace
|
||||
type commit
|
||||
tag v0.5.4
|
||||
tagger Michael Shigorin <mike@altlinux.org> 1326746252 +0200
|
||||
|
||||
apt-get install hasher
|
@@ -1 +1 @@
|
||||
9e3e95942c73c5a2cca794e28935e6257cb37bc9 v0.5.4
|
||||
5f2dbc6d511b0a0a39799983df054a249298dd8c v0.5.6
|
||||
|
@@ -1,22 +1,24 @@
|
||||
# desktop distributions
|
||||
ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
distro/desktop-base: distro/installer use/repo/main \
|
||||
use/syslinux/ui-vesamenu use/x11/xorg use/bootloader/grub
|
||||
distro/.desktop-base: distro/.installer \
|
||||
use/syslinux/ui-vesamenu use/x11/xorg
|
||||
@$(call set,INSTALLER,desktop)
|
||||
|
||||
distro/desktop-mini: distro/desktop-base \
|
||||
use/lowmem use/x11/xdm use/bootloader/lilo \
|
||||
use/power/acpi/button use/cleanup/alterator
|
||||
distro/.desktop-mini: distro/.desktop-base \
|
||||
use/lowmem use/x11/xdm use/power/acpi/button \
|
||||
use/cleanup/alterator
|
||||
|
||||
distro/icewm: distro/desktop-mini
|
||||
distro/icewm: distro/.desktop-mini
|
||||
@$(call add,BASE_LISTS,$(call tags,icewm desktop))
|
||||
|
||||
distro/ltsp-icewm: distro/icewm use/ltsp use/firmware
|
||||
@$(call add,BASE_LISTS,$(call tags,base network))
|
||||
@$(call add,BASE_LISTS,ltsp)
|
||||
@$(call add,BASE_PACKAGES,apt-repo)
|
||||
@$(call add,BASE_PACKAGES,firefox)
|
||||
distro/tde: distro/.desktop-mini use/x11/kdm
|
||||
@$(call add,BASE_LISTS, \
|
||||
$(call tags,(base || desktop) && (network || tde)))
|
||||
|
||||
distro/ltsp-icewm: distro/icewm use/ltsp/base
|
||||
|
||||
distro/ltsp-tde: distro/tde use/ltsp/base
|
||||
|
||||
distro/desktop-systemd: distro/icewm use/systemd
|
||||
|
||||
|
@@ -1,12 +1,16 @@
|
||||
# live images
|
||||
ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
distro/syslinux: distro/.init \
|
||||
use/syslinux/localboot.cfg use/syslinux/ui-vesamenu \
|
||||
use/hdt use/memtest
|
||||
|
||||
distro/dos: distro/.init use/dos use/syslinux/ui-menu
|
||||
distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
|
||||
distro/live: distro/.base use/live/base use/power/acpi/cpufreq
|
||||
distro/live-systemd: distro/.base use/live/base use/systemd
|
||||
|
||||
distro/.live-x11: distro/live use/live/autologin use/power/acpi/button
|
||||
distro/.live-x11: distro/live use/firmware use/power/acpi/button
|
||||
|
||||
distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
|
||||
@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
|
||||
@@ -26,20 +30,24 @@ distro/live-builder: distro/.base use/repo/main \
|
||||
distro/live-install: distro/.base use/live/base use/syslinux/localboot.cfg
|
||||
@$(call add,LIVE_PACKAGES,live-install)
|
||||
|
||||
distro/live-icewm: distro/.live-x11
|
||||
distro/live-icewm: distro/.live-x11 use/live/autologin
|
||||
@$(call add,LIVE_LISTS, \
|
||||
$(call tags,(base || desktop) && (live || network || icewm)))
|
||||
|
||||
distro/live-razorqt: distro/.live-x11
|
||||
distro/live-razorqt: distro/.live-x11 use/x11/lightdm use/syslinux/ui-vesamenu
|
||||
@$(call add,LIVE_LISTS, \
|
||||
$(call tags,(base || desktop) && (live || network || razorqt)))
|
||||
|
||||
distro/live-tde: distro/.live-x11 use/x11/kdm use/syslinux/ui-vesamenu
|
||||
@$(call add,LIVE_LISTS, \
|
||||
$(call tags,(base || desktop) && (live || network || tde)))
|
||||
|
||||
distro/live-rescue: distro/live-icewm
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
|
||||
@$(call add,LIVE_LISTS, \
|
||||
$(call tags,(base || extra) && (archive || rescue || network)))
|
||||
|
||||
distro/live-webkiosk: distro/.live-x11 use/live/hooks
|
||||
distro/live-webkiosk: distro/.live-x11 use/live/autologin use/live/hooks
|
||||
@$(call add,LIVE_PACKAGES,livecd-webkiosk)
|
||||
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
|
||||
|
||||
|
@@ -1,19 +1,18 @@
|
||||
# server distributions
|
||||
ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
distro/server-base: distro/installer use/repo/main \
|
||||
use/syslinux/ui-menu use/memtest use/bootloader/grub
|
||||
distro/.server-base: distro/.installer use/syslinux/ui-menu use/memtest
|
||||
@$(call add,BASE_LISTS,server-base)
|
||||
|
||||
distro/server-mini: distro/server-base use/cleanup/x11-alterator
|
||||
distro/server-mini: distro/.server-base use/cleanup/x11-alterator
|
||||
@$(call set,KFLAVOURS,el-smp)
|
||||
@$(call add,THE_KMODULES,e1000e igb)
|
||||
@$(call add,STAGE1_KMODULES,e1000e igb)
|
||||
@$(call add,BASE_LISTS,\
|
||||
$(call tags,base && (server || network || security || pkg)))
|
||||
@$(call add,BASE_LISTS,$(call tags,extra network))
|
||||
@$(call add,BASE_LISTS,$(call tags,extra (server || network)))
|
||||
|
||||
distro/server-systemd: distro/server-mini use/systemd
|
||||
distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo
|
||||
|
||||
distro/server-ovz: distro/server-mini \
|
||||
use/hdt use/rescue use/firmware/server use/power/acpi/button
|
||||
|
@@ -1,7 +1,7 @@
|
||||
предположения фрагментов кода об окружении
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
NB: пути приводятся от верхнего уровня
|
||||
NB: пути приводятся от верхнего уровня; проект в целом предполагает
|
||||
GNU make 3.81 (с использованием которого и разрабатывается).
|
||||
|
||||
- pkg.in/lists/Makefile
|
||||
+ ожидает, что названия пакаджлистов указываются в переменных
|
||||
|
@@ -65,6 +65,11 @@
|
||||
+ значение: пусто (по умолчанию) либо любая строка
|
||||
+ см. ../lib/build.mk
|
||||
|
||||
- SAVE_PROFILE
|
||||
+ сохраняет архив сгенерированного профиля в .disk/
|
||||
+ значение: пусто (по умолчанию) либо любая строка
|
||||
+ см. ../image.in/Makefile
|
||||
|
||||
пример
|
||||
~~~~~~
|
||||
make DEBUG=1 CLEAN=1 distro/syslinux.iso
|
||||
|
@@ -14,13 +14,10 @@
|
||||
после инициализации профиля (см. ../image.in/) и копирования
|
||||
субпрофилей (см. ../sub.in/). Для каждой фичи, указанной
|
||||
в $(FEATURES), копируются подкаталоги сообразно субпрофилям,
|
||||
а также производится обработка {tagged/,}{image-,}scripts.d/;
|
||||
затем выполняется скрипт generate.sh и задействуется generate.mk
|
||||
а также производится обработка {image-,}scripts.d/; затем
|
||||
выполняется скрипт generate.sh и задействуется generate.mk
|
||||
(при их наличии).
|
||||
|
||||
NB: тегированные скрипты являются экспериментальными,
|
||||
возможны недоработки и существенные изменения!
|
||||
|
||||
Если фича дополняет хуками семейство целевых субпрофилей,
|
||||
построенных на одном базовом, можно воспользоваться подкаталогом
|
||||
с именем исходного базового субпрофиля (см. $src, $dst в Makefile).
|
||||
|
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# FIXME: test run for installer-distro-altlinux-generic 6.0-alt2
|
||||
# NB: grub is currently the default in ALT Linux
|
||||
|
||||
sed -i "s/^grub$/$GLOBAL_BASE_BOOTLOADER/" /usr/share/install2/installer-steps
|
||||
sed -ri "s/^(grub|lilo)$/$GLOBAL_BASE_BOOTLOADER/" \
|
||||
/usr/share/install2/installer-steps
|
||||
|
0
features.in/install2/tagged/image-scripts.d/.gitignore
vendored
Normal file
0
features.in/install2/tagged/image-scripts.d/.gitignore
vendored
Normal file
@@ -1,7 +1,10 @@
|
||||
#!/bin/sh
|
||||
#!/bin/sh -x
|
||||
# * reset password for root
|
||||
# * add user `altlinux' (without password)
|
||||
|
||||
NPG="nopasswdlogin"
|
||||
GRPLIST="users scanner audio radio proc cdrom cdwriter wheel fuse $NPG"
|
||||
|
||||
verbose()
|
||||
{
|
||||
if [ -n "$GLOBAL_VERBOSE" ]; then
|
||||
@@ -12,8 +15,9 @@ verbose()
|
||||
add_user()
|
||||
{
|
||||
verbose "Add $1 user"
|
||||
groupadd -r "$NPG"
|
||||
local groups=
|
||||
for g in users scanner audio radio proc cdrom cdwriter wheel fuse; do
|
||||
for g in $GRPLIST; do
|
||||
if groupmod $g 2>/dev/null; then
|
||||
if [ -n "$groups" ]; then
|
||||
groups="$groups,$g"
|
||||
|
@@ -22,6 +22,15 @@ AUTOLOGIN=yes
|
||||
E_O_F
|
||||
fi
|
||||
|
||||
# lightdm autologin
|
||||
LIGHTDM_CONF=/etc/lightdm/lightdm.conf
|
||||
if [ -f "$LIGHTDM_CONF" ]; then
|
||||
sed -i \
|
||||
-e "s/^#\(autologin-user=\).*$/\1$USER/" \
|
||||
-e "s/^#\(autologin-user-timeout=0\)/\1/" \
|
||||
"$LIGHTDM_CONF"
|
||||
fi
|
||||
|
||||
# gdm2 autologin
|
||||
GDM_CONF=/etc/X11/gdm/custom.conf
|
||||
if [ -f "$GDM_CONF" ]; then
|
||||
|
@@ -1,6 +1,13 @@
|
||||
#!/bin/sh -efu
|
||||
# attempt to autoconfigure ethernet
|
||||
|
||||
[ -x /sbin/dhcpcd -o -x /sbin/dhclient ] || {
|
||||
echo "NOT configuring DHCP for eth0" >&2
|
||||
exit 0
|
||||
}
|
||||
|
||||
echo "configuring DHCP for eth0" >&2
|
||||
|
||||
mkdir -p /etc/net/ifaces/eth0 && {
|
||||
echo TYPE=eth
|
||||
echo BOOTPROTO=dhcp
|
@@ -1,3 +1,8 @@
|
||||
use/ltsp:
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
|
||||
@$(call add,MAIN_LISTS,ltsp-client ltsp-client.$(ARCH))
|
||||
@$(call add,BASE_LISTS,ltsp)
|
||||
|
||||
use/ltsp/base: use/ltsp use/firmware
|
||||
@$(call add,BASE_LISTS,$(call tags,base network))
|
||||
@$(call add,BASE_PACKAGES,apt-repo firefox)
|
||||
|
@@ -12,3 +12,10 @@ use/x11/runlevel5: use/x11/xorg
|
||||
### xdm: see also #23108
|
||||
use/x11/xdm: use/x11/runlevel5
|
||||
@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole)
|
||||
|
||||
use/x11/kdm: use/x11/runlevel5
|
||||
@$(call add,THE_PACKAGES,kdebase-kdm)
|
||||
|
||||
### : some set()-like thing might be better?
|
||||
use/x11/lightdm: use/x11/runlevel5
|
||||
@$(call add,THE_PACKAGES,lightdm)
|
||||
|
@@ -47,6 +47,13 @@ include $(MKIMAGE_PREFIX)/targets.mk
|
||||
pack-image: OUTDIR = $(IMAGEDIR)
|
||||
pack-image: imagedir
|
||||
|
||||
copy-tree: $(SAVE_PROFILE:%=save-profile)
|
||||
|
||||
save-profile:
|
||||
@mkdir -p files/.disk; \
|
||||
git archive --prefix=mkimage-profile/ HEAD \
|
||||
| gzip -9 > files/.disk/profile.tgz
|
||||
|
||||
.PHONY: imagedir postprocess debug
|
||||
|
||||
imagedir:
|
||||
|
@@ -23,15 +23,12 @@ distro/.init: profile/bare
|
||||
distro/.base: distro/.init
|
||||
@$(call set,KFLAVOURS,std-def)
|
||||
|
||||
# bootloader test target
|
||||
distro/syslinux: distro/.init \
|
||||
use/syslinux/localboot.cfg use/syslinux/ui-vesamenu \
|
||||
use/hdt use/memtest
|
||||
|
||||
# something marginally useful (as a network-only installer)
|
||||
# NB: doesn't carry stage3 thus cannot use/bootloader
|
||||
distro/installer: distro/.base use/install2 use/syslinux/localboot.cfg
|
||||
@$(call set,INSTALLER,altlinux-generic)
|
||||
@$(call set,STAGE1_KMODULES_REGEXP,drm.*) # for KMS
|
||||
|
||||
distro/.installer: distro/installer use/bootloader/grub use/repo/main
|
||||
|
||||
endif
|
||||
|
@@ -16,7 +16,16 @@ ifneq (,$(findstring install2,$(FEATURES)))
|
||||
DOTBASE := dot-base
|
||||
endif
|
||||
|
||||
all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE)
|
||||
all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE) copy-lists copy-groups
|
||||
@if type -t git >&/dev/null && cd $(TARGET); then \
|
||||
if [ -n "`git status -s`" ]; then \
|
||||
git add . && \
|
||||
git commit -qam "requested $(SUFFIX) copied over"; \
|
||||
fi; \
|
||||
cd - >&/dev/null; \
|
||||
fi
|
||||
|
||||
copy-lists:
|
||||
@# env | sort -u | grep _LISTS | xargs cp
|
||||
@$(foreach V, \
|
||||
$(filter %_LISTS,$(sort $(.VARIABLES))), \
|
||||
@@ -24,6 +33,11 @@ all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE)
|
||||
$(shell cp --parents -at $(TARGET) \
|
||||
-- $(value $V))))
|
||||
|
||||
copy-groups:
|
||||
@if [ -n "$(THE_GROUPS)$(MAIN_GROUPS)" ]; then \
|
||||
cp -at $(TARGET) -- $(THE_GROUPS) $(MAIN_GROUPS); \
|
||||
fi
|
||||
|
||||
# args: name, suffix, command
|
||||
define dump-THEM
|
||||
if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
|
||||
@@ -39,16 +53,6 @@ dot-base:
|
||||
$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
|
||||
$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
|
||||
} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' >$(TARGET)/.base
|
||||
@if [ -n "$(THE_GROUPS)$(MAIN_GROUPS)" ]; then \
|
||||
cp -at $(TARGET) -- $(THE_GROUPS) $(MAIN_GROUPS); \
|
||||
fi
|
||||
@if type -t git >&/dev/null && cd $(TARGET); then \
|
||||
if [ -n "`git status -s`" ]; then \
|
||||
git add . && \
|
||||
git commit -qam "requested $(SUFFIX) copied over"; \
|
||||
fi; \
|
||||
cd - >&/dev/null; \
|
||||
fi
|
||||
|
||||
# do beforehand as foreach gets expanded before recipe execution
|
||||
$(TARGET):
|
||||
|
@@ -1,14 +1,21 @@
|
||||
ltsp-server
|
||||
ltsp-server-basic
|
||||
openssh-server
|
||||
|
||||
alterator-ltsconf
|
||||
#alterator-ltsconf
|
||||
#alterator-standalone
|
||||
|
||||
alsa-plugins
|
||||
alsa-plugins-pulse
|
||||
alsa-utils
|
||||
aplay
|
||||
mplayer
|
||||
|
||||
syslinux
|
||||
mkisofs
|
||||
|
||||
iftop
|
||||
|
||||
#kde-settings-kded-no_media_popup
|
||||
|
||||
#docs-install_ltsp
|
||||
|
1
pkg.in/lists/tagged/desktop+network
Normal file
1
pkg.in/lists/tagged/desktop+network
Normal file
@@ -0,0 +1 @@
|
||||
firefox
|
@@ -1,4 +1,4 @@
|
||||
razorqt
|
||||
razor-qt
|
||||
arora
|
||||
qtfm
|
||||
qterminal
|
||||
|
@@ -16,3 +16,6 @@ qt4-settings
|
||||
qtparted
|
||||
tubularix
|
||||
smplayer
|
||||
|
||||
# upstream recommended
|
||||
#ptbatterysystemtray
|
||||
|
21
pkg.in/lists/tagged/desktop+tde
Normal file
21
pkg.in/lists/tagged/desktop+tde
Normal file
@@ -0,0 +1,21 @@
|
||||
kdebase
|
||||
###kde-icon-theme-tango
|
||||
kde-icon-theme-nuvola
|
||||
tango-icon-theme-extras
|
||||
kkbswitch
|
||||
kdegraphics-ksnapshot
|
||||
kdegraphics-kview
|
||||
kdeutils-laptop
|
||||
kdepim-akregator
|
||||
gtk2-themes-qtcurve
|
||||
#kde-styles-qtcurve
|
||||
kdeutils-ark
|
||||
#kdebluetooth
|
||||
kdeutils-kcalc
|
||||
kdegraphics-kpdf
|
||||
kde-i18n-ru
|
||||
kdeaddons-konqueror
|
||||
#digikam
|
||||
#digikam-image-plugins
|
||||
kaffeine
|
||||
kdemultimedia-kmix
|
Reference in New Issue
Block a user