forked from altcloud/mkimage-profiles
Compare commits
64 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
f10f3b18db | ||
|
6139571a8b | ||
|
d3a39f2168 | ||
|
867b2f65c9 | ||
|
13094e7901 | ||
|
18e6406588 | ||
|
f7a97306fb | ||
|
92ff4c1cc8 | ||
|
ba2ca7e578 | ||
|
971732bfe6 | ||
|
acf17cd785 | ||
|
6fa08c52e7 | ||
|
8645219667 | ||
|
a89fff3c6a | ||
|
8fc64a023f | ||
|
5fd2be3edd | ||
|
cbf8426add | ||
|
e5fdaacc94 | ||
|
91466e6643 | ||
|
375e1afe34 | ||
|
eb569544ca | ||
|
77f1459f52 | ||
|
28f7f9be27 | ||
|
cec6b26207 | ||
|
96bdf36935 | ||
|
c12f0c17bc | ||
|
5834dac8c8 | ||
|
6a554e21ab | ||
|
313b279d40 | ||
|
ad264c7033 | ||
|
ec8bcac5ff | ||
|
3161ec500b | ||
|
458d72b8c3 | ||
|
d83eb78762 | ||
|
61ead13d3a | ||
|
d9ae996571 | ||
|
5fcc2aaa78 | ||
|
e46c259a90 | ||
|
692f8ec010 | ||
|
423c250ec8 | ||
|
de6598a6d9 | ||
|
c133f161bf | ||
|
b3b09f55c0 | ||
|
e7fa4c466a | ||
|
a8819db073 | ||
|
efd06839f7 | ||
|
7603f0728a | ||
|
1eb0dbc534 | ||
|
aef58a4d60 | ||
|
67c224fc67 | ||
|
6a4ede8ccd | ||
|
8e668d4ff2 | ||
|
6d8cbcb61d | ||
|
2d3e5f2b1c | ||
|
fc061fba0c | ||
|
0f4e72cf79 | ||
|
9e776e3ade | ||
|
671c788e3a | ||
|
f576b01988 | ||
|
40e680e50d | ||
|
fd461c7dd1 | ||
|
0d524763ed | ||
|
bee01a86cd | ||
|
75c08d9f3c |
@@ -1,5 +1,5 @@
|
||||
Name: mkimage-profiles
|
||||
Version: 0.9.5
|
||||
Version: 0.9.8.1
|
||||
Release: alt1
|
||||
|
||||
Summary: ALT Linux based distribution metaprofile
|
||||
@@ -78,6 +78,18 @@ cp -a * %buildroot%mpdir
|
||||
%doc %docs/*
|
||||
|
||||
%changelog
|
||||
* Tue Feb 19 2013 Michael Shigorin <mike@altlinux.org> 0.9.8.1-alt1
|
||||
- works with make-initrd 0.8.1+ (see #28578)
|
||||
|
||||
* Mon Feb 18 2013 Michael Shigorin <mike@altlinux.org> 0.9.8-alt1
|
||||
- live fixes/tweaks galore
|
||||
|
||||
* Mon Feb 11 2013 Michael Shigorin <mike@altlinux.org> 0.9.7-alt1
|
||||
- going nightly
|
||||
|
||||
* Mon Feb 04 2013 Michael Shigorin <mike@altlinux.org> 0.9.6-alt1
|
||||
- assorted fixes
|
||||
|
||||
* Mon Jan 21 2013 Michael Shigorin <mike@altlinux.org> 0.9.5-alt1
|
||||
- homeros
|
||||
|
||||
|
@@ -1,6 +0,0 @@
|
||||
object a133490be9b705457f738cd12ff297bc672e2437
|
||||
type commit
|
||||
tag v0.9.4
|
||||
tagger Michael Shigorin <mike@altlinux.org> 1358193993 +0400
|
||||
|
||||
restricted boot
|
6
.gear/tags/9f5450c9dc242a2ea3e07973a06f6c8821ed4672
Normal file
6
.gear/tags/9f5450c9dc242a2ea3e07973a06f6c8821ed4672
Normal file
@@ -0,0 +1,6 @@
|
||||
object 867b2f65c9b571ab54a4bc7e158bcaaa3d80756b
|
||||
type commit
|
||||
tag v0.9.8
|
||||
tagger Michael Shigorin <mike@altlinux.org> 1361217242 +0200
|
||||
|
||||
live fixes
|
@@ -1 +1 @@
|
||||
285b2e0c1b9673a8476f0fe7066e69b0281b8d8a v0.9.4
|
||||
9f5450c9dc242a2ea3e07973a06f6c8821ed4672 v0.9.8
|
||||
|
@@ -3,13 +3,19 @@
|
||||
|
||||
. shell-error
|
||||
|
||||
INIT=
|
||||
if [ "$1" = "-i" ]; then
|
||||
INIT=yes
|
||||
shift
|
||||
fi
|
||||
|
||||
[ -d "$1" ] || fatal "$1 is not an existing directory"
|
||||
|
||||
if type -t git >&/dev/null && pushd "$1" >/dev/null; then
|
||||
if [ -z "$(git config --global user.name)" ]; then
|
||||
exit 0
|
||||
fi
|
||||
if [ ! -d .git ]; then
|
||||
if [ -n "$INIT" -a ! -d .git ]; then
|
||||
git init -q || fatal "git init failed"
|
||||
fi
|
||||
if [ -n "$(git status -s)" ]; then
|
||||
|
@@ -17,7 +17,7 @@ distro/.desktop-extra:
|
||||
distro/tde: distro/.desktop-mini +tde
|
||||
@$(call set,KFLAVOURS,led-ws)
|
||||
|
||||
distro/kde-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde
|
||||
distro/kde4-lite: distro/.desktop-mini distro/.desktop-network distro/.desktop-extra +kde4-lite
|
||||
@$(call set,KFLAVOURS,std-def)
|
||||
|
||||
distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
|
||||
|
@@ -1,6 +1,6 @@
|
||||
|
||||
ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
distro/homeros-nano: distro/.live-base use/live/textinstall use/homeros; @:
|
||||
distro/homeros-mini: distro/.live-base use/live/textinstall use/homeros; @:
|
||||
|
||||
endif
|
||||
|
@@ -7,11 +7,12 @@ distro/syslinux: distro/.init \
|
||||
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
|
||||
|
||||
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
|
||||
distro/.live-desktop: distro/.base +live use/plymouth/live; @:
|
||||
distro/.live-desktop: distro/.base +live use/live/install use/live/net-eth \
|
||||
use/plymouth/live use/efi; @:
|
||||
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
|
||||
|
||||
distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
|
||||
use/syslinux/timeout/1 use/cleanup +power
|
||||
distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
|
||||
use/syslinux/timeout/1 use/cleanup use/efi/signed use/live/net-eth
|
||||
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
|
||||
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
|
||||
|
||||
@@ -31,9 +32,10 @@ distro/live-builder: distro/live-builder-mini use/dev/repo
|
||||
distro/live-install: distro/.live-base use/live/textinstall; @:
|
||||
distro/.livecd-install: distro/.live-base use/live/install; @:
|
||||
|
||||
distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
|
||||
distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @:
|
||||
distro/live-icewm: distro/.live-desktop use/x11/lightdm/gtk +icewm; @:
|
||||
distro/live-razorqt: distro/.live-desktop +razorqt; @:
|
||||
distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
|
||||
distro/live-fvwm: distro/.live-desktop-ru use/x11/lightdm/gtk use/x11/fvwm; @:
|
||||
|
||||
distro/live-rescue: distro/live-icewm use/efi
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
|
||||
@@ -42,9 +44,9 @@ distro/live-rescue: distro/live-icewm use/efi
|
||||
|
||||
distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru
|
||||
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
|
||||
@$(call add,LIVE_PACKAGES,livecd-webkiosk)
|
||||
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
|
||||
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
|
||||
@$(call set,KFLAVOURS,led-ws)
|
||||
@#$(call set,KFLAVOURS,led-ws)
|
||||
|
||||
# NB: flash/java plugins are predictable security holes
|
||||
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
|
||||
|
@@ -3,24 +3,19 @@ ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
|
||||
distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
|
||||
use/live/install use/live/repo use/x11/3d-free use/systemd \
|
||||
use/firmware/wireless use/efi/signed use/luks \
|
||||
use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
|
||||
use/systemd use/firmware/wireless use/efi/signed use/luks \
|
||||
+vmguest use/memtest use/branding use/syslinux/ui/gfxboot
|
||||
@$(call add,LIVE_PACKAGES,openssh strace alterator-standalone)
|
||||
@$(call add,LIVE_PACKAGES,cpufreq-simple)
|
||||
@$(call add,LIVE_PACKAGES,livecd-online-repo apt-repo)
|
||||
@$(call add,LIVE_PACKAGES,xdg-user-dirs)
|
||||
@$(call add,LIVE_PACKAGES,synaptic-usermode)
|
||||
@$(call add,LIVE_PACKAGES,firefox-ru)
|
||||
@$(call add,LIVE_PACKAGES,net-tools)
|
||||
@$(call add,LIVE_PACKAGES,uvcview)
|
||||
@$(call add,LIVE_PACKAGES,powertop)
|
||||
@$(call add,LIVE_LISTS,$(call tags,base regular))
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue extra))
|
||||
@$(call add,LIVE_LISTS,domain-client)
|
||||
@$(call add,THE_BRANDING,indexhtml notes alterator bootloader)
|
||||
@$(call set,KFLAVOURS,std-def)
|
||||
@$(call add,KMODULES,r8168)
|
||||
@$(call try,SAVE_PROFILE,yes)
|
||||
|
||||
distro/.regular-gtk: distro/.regular-desktop use/x11/gdm2.20; @:
|
||||
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
|
||||
@$(call add,THE_BRANDING,graphics)
|
||||
|
||||
distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind
|
||||
@$(call add,LIVE_PACKAGES,xxkb mutt)
|
||||
@@ -36,17 +31,19 @@ distro/regular-e17: distro/.regular-gtk use/x11/e17
|
||||
|
||||
distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
|
||||
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
|
||||
@$(call add,LIVE_PACKAGES,fontconfig-infinality)
|
||||
|
||||
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
|
||||
|
||||
distro/regular-tde: distro/.regular-desktop +tde
|
||||
distro/regular-tde: distro/.regular-desktop +tde +plymouth
|
||||
@$(call add,LIVE_LISTS,$(call tags,desktop nm))
|
||||
@$(call add,LIVE_PACKAGES,kdegames kdeedu)
|
||||
|
||||
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4
|
||||
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 +plymouth
|
||||
@$(call add,LIVE_PACKAGES,kde4-regular)
|
||||
@$(call add,LIVE_PACKAGES,plasma-applet-networkmanager)
|
||||
|
||||
distro/regular-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4; @:
|
||||
distro/regular-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4 \
|
||||
+plymouth; @:
|
||||
|
||||
endif
|
||||
|
@@ -11,7 +11,7 @@ distro/server-nano: distro/.server-base \
|
||||
|
||||
distro/server-mini: distro/.server-base use/server/mini \
|
||||
use/cleanup/x11-alterator use/efi
|
||||
@$(call set,KFLAVOURS,led-ws)
|
||||
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
|
||||
|
||||
distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
|
||||
use/firmware/server use/firmware/wireless use/power/acpi/button
|
||||
|
@@ -19,9 +19,6 @@ distro/live-gns3: distro/live-icewm
|
||||
@$(call add,LIVE_LISTS,gns3)
|
||||
@$(call add,LIVE_KMODULES,kvm virtualbox)
|
||||
|
||||
distro/live-efi: distro/live-install use/efi
|
||||
@$(call set,KFLAVOURS,un-def) ### CONFIG_FB_EFI
|
||||
|
||||
distro/icewm-efi: distro/icewm use/efi/debug use/firmware
|
||||
@$(call add,INSTALL2_PACKAGES,strace)
|
||||
|
||||
|
@@ -2,7 +2,12 @@
|
||||
|
||||
NB: пути приводятся от верхнего уровня; проект в целом предполагает
|
||||
ALT Linux 6.0+ и GNU make 3.81+ (на которых и разрабатывается),
|
||||
но может быть портирован вместе с mkimage.
|
||||
но может быть портирован вместе с mkimage. Если что-либо не работает
|
||||
или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
|
||||
собственно пакетная база), поскольку именно на нём происходит основная
|
||||
разработка mkimage-profiles. Сломанная сборка на текущем стабильном
|
||||
бранче считается ошибкой и подлежит исправлению, если оно технически
|
||||
возможно на базе этого бранча.
|
||||
|
||||
* lib/report.mk
|
||||
** ожидает, что каждая подлежащая трассированию цель каждого
|
||||
|
@@ -8,16 +8,13 @@ BOOT_SYSI := $(META_SYSTEM_ID)
|
||||
BOOT_PUBL := $(META_PUBLISHER)
|
||||
BOOT_PREP := $(META_PREPARER)
|
||||
BOOT_APPI := $(META_APP_ID)
|
||||
BOOT_VOLI := $(META_VOL_ID)
|
||||
BOOT_VOLI := $(shell echo $(META_VOL_ID) | cut -c1-32)
|
||||
BOOT_VOLS := $(META_VOL_SET)
|
||||
BOOT_BIBL := $(META_BIBLIO)
|
||||
BOOT_ABST := $(META_ABSTRACT)
|
||||
|
||||
BOOT_TYPE := isolinux
|
||||
|
||||
# see also ../scripts.d/01-isosort; needs mkimage-0.2.2+
|
||||
MKI_SORTFILE := /tmp/isosort
|
||||
|
||||
all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
|
||||
postprocess $(GLOBAL_CLEAN_WORKDIR)
|
||||
|
||||
|
@@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
# provide mkisofs with image contents sort order hints
|
||||
|
||||
### split over features or leave in a single piece?
|
||||
|
||||
# NB: only a single space/tab in between, no trailing whitespace
|
||||
cat > /tmp/isosort <<__EOF__
|
||||
ALTLinux 0
|
||||
Metadata 100
|
||||
altinst 700
|
||||
rescue 800
|
||||
live 900
|
||||
syslinux 1000
|
||||
__EOF__
|
@@ -1,3 +1,5 @@
|
||||
+efi: use/efi; @:
|
||||
|
||||
ifeq (x86_64,$(ARCH))
|
||||
|
||||
EFI_LISTS := $(call tags,base efi)
|
||||
@@ -9,7 +11,7 @@ use/efi:
|
||||
@$(call add,RESCUE_LISTS,$(EFI_LISTS))
|
||||
@$(call add,THE_PACKAGES,$$(EFI_SHELL))
|
||||
@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
|
||||
@$(call add,INSTALL2_PACKAGES,dosfstools)
|
||||
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
|
||||
@$(call try,EFI_BOOTLOADER,elilo) # default one
|
||||
|
||||
use/efi/refind: use/efi
|
||||
@@ -17,6 +19,7 @@ use/efi/refind: use/efi
|
||||
|
||||
use/efi/signed: use/efi
|
||||
@$(call set,EFI_CERT,altlinux)
|
||||
@$(call add,THE_PACKAGES,shim-signed)
|
||||
@$(call set,EFI_SHELL,efi-shell-signed) # even more useful
|
||||
@$(call add,RESCUE_PACKAGES,refind-signed)
|
||||
@$(call add,RESCUE_PACKAGES,openssl sbsigntools)
|
||||
|
@@ -3,6 +3,7 @@ use/homeros:
|
||||
# @$(call set,BRANDING,simply-linux)
|
||||
# @$(call add,THE_BRANDING,menu xfce-settings)
|
||||
@$(call add,THE_LISTS,homeros/voiceman)
|
||||
@$(call add,THE_LISTS,homeros/homeros)
|
||||
@$(call add,THE_LISTS,homeros/tts)
|
||||
@$(call add,THE_LISTS,homeros/yasr)
|
||||
@$(call add,THE_LISTS,homeros/tools)
|
||||
|
@@ -3,9 +3,9 @@
|
||||
cat <<EOF > /etc/rc.d/rc.local
|
||||
#!/bin/sh
|
||||
|
||||
amixer set Master 100%
|
||||
amixer set Master 75%
|
||||
amixer set Master toggle
|
||||
amixer set PCM 100%
|
||||
amixer set PCM 75%
|
||||
amixer set PCM toggle
|
||||
|
||||
EOF
|
||||
|
@@ -1 +1,2 @@
|
||||
Эта фича привносит код, имеющий смысл при добавлении в образ ядра.
|
||||
Эта фича привносит код, имеющий смысл при добавлении в образ ядра,
|
||||
и задаёт начальный вариант такового.
|
||||
|
@@ -1,4 +1,10 @@
|
||||
###
|
||||
# choose std kernel flavour for max RAM size support
|
||||
ifeq (i586,$(ARCH))
|
||||
BIGRAM := std-pae
|
||||
else
|
||||
BIGRAM := std-def
|
||||
endif
|
||||
|
||||
use/kernel:
|
||||
@$(call add_feature)
|
||||
@$(call set,KFLAVOURS,un-def)
|
||||
@$(call set,KFLAVOURS,std-def)
|
||||
|
@@ -14,7 +14,8 @@ use/live/x11: use/live use/firmware use/x11/xorg
|
||||
@$(call add,LIVE_PACKAGES,xinit)
|
||||
|
||||
# optimized out: use/x11/xorg
|
||||
use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
|
||||
use/live/desktop: use/live/base use/x11/wacom use/live/sound \
|
||||
+vmguest +power +efi
|
||||
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
|
||||
@$(call add,LIVE_LISTS,$(call tags,base l10n))
|
||||
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
|
||||
@@ -52,3 +53,8 @@ use/live/ru: use/live
|
||||
|
||||
use/live/sound: use/live
|
||||
@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
|
||||
|
||||
# eth0 instead of enp0s3
|
||||
use/live/net-eth: use/live
|
||||
@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
|
||||
@$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth)
|
||||
|
@@ -12,8 +12,11 @@ switch() {
|
||||
esac
|
||||
|
||||
{
|
||||
[ ! -x /bin/systemctl ] || /bin/systemctl $sc $1.service
|
||||
[ ! -x /sbin/chkconfig ] || /sbin/chkconfig $1 $cc
|
||||
[ ! -x /bin/systemctl ] ||
|
||||
/bin/systemctl --no-reload $sc $1.service
|
||||
|
||||
[ ! -x /sbin/chkconfig ] ||
|
||||
/sbin/chkconfig $1 $cc
|
||||
} 2>/dev/null
|
||||
}
|
||||
|
||||
@@ -30,11 +33,14 @@ livecd-hostname
|
||||
livecd-save-nfs
|
||||
livecd-setauth
|
||||
livecd-setlocale
|
||||
livecd-net-eth
|
||||
network
|
||||
NetworkManager
|
||||
connman
|
||||
random
|
||||
rpcbind
|
||||
plymouth
|
||||
avahi-daemon
|
||||
"
|
||||
|
||||
# NB: dnsmasq: https://bugzilla.altlinux.org/show_bug.cgi?id=18799
|
||||
|
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh -e
|
||||
#!/bin/sh
|
||||
|
||||
if [ ! -x /usr/bin/X ]; then
|
||||
echo "SKIP autologin: X not installed" >&2
|
||||
|
@@ -23,6 +23,18 @@ DOMAINNAME="localdomain"
|
||||
verbose "Init /etc/hosts with 127.0.0.1 localhost"
|
||||
echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts
|
||||
|
||||
prefix="/etc/net/ifaces"
|
||||
|
||||
# seems like aufs bug on O_TRUNC writes:
|
||||
# aufs au_lkup_neg:267:kworker/0:2[998]:
|
||||
# I/O Error, resolv.conf should be negative on b0.
|
||||
# OTOH lo interface is now brought up in initrd
|
||||
# so this shoudn't really matter
|
||||
if [ -d "$prefix"/lo ]; then
|
||||
echo 'nameserver 8.8.8.8' >> "$prefix"/lo/resolv.conf
|
||||
fi
|
||||
find /var -name resolv.conf -or -name nsswitch.conf -delete
|
||||
|
||||
netcfg="/etc/sysconfig/network"
|
||||
|
||||
verbose "Enable networking, set hostname to $HOSTNAME, domainname to $DOMAINNAME"
|
||||
@@ -30,21 +42,22 @@ shell_config_set "$netcfg" NETWORKING yes
|
||||
shell_config_set "$netcfg" HOSTNAME "$HOSTNAME"
|
||||
shell_config_set "$netcfg" DOMAINNAME "$DOMAINNAME"
|
||||
|
||||
|
||||
if [ -x /usr/sbin/NetworkManager ] ; then
|
||||
verbose "Setup defaults for NetworkManager"
|
||||
shell_config_set /etc/net/ifaces/default/options-eth NM_CONTROLLED yes
|
||||
shell_config_set /etc/net/ifaces/default/options-eth DISABLED yes
|
||||
shell_config_set /etc/net/ifaces/default/options-eth BOOTPROTO dhcp
|
||||
# NB: see also #28484 and livecd-net-eth for runtime configuration
|
||||
defcfg="$prefix/default/options-eth"
|
||||
if [ -x /usr/sbin/NetworkManager -o -x /usr/sbin/connmand ] ; then
|
||||
verbose "Setup defaults for NetworkManager/connman"
|
||||
shell_config_set "$defcfg" NM_CONTROLLED yes
|
||||
shell_config_set "$defcfg" DISABLED yes
|
||||
shell_config_set "$defcfg" BOOTPROTO dhcp
|
||||
else
|
||||
# attempt to autoconfigure ethernet by etcnet
|
||||
if [ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
|
||||
if [ -x /lib/udev/write_net_rules ] &&
|
||||
[ -x /sbin/dhcpcd -o -x /sbin/dhclient ]; then
|
||||
verbose "configuring DHCP for eth0"
|
||||
|
||||
mkdir -p /etc/net/ifaces/eth0 && {
|
||||
mkdir -p "$prefix"/eth0 && {
|
||||
echo TYPE=eth
|
||||
echo BOOTPROTO=dhcp
|
||||
} > /etc/net/ifaces/eth0/options
|
||||
} > "$prefix"/eth0/options
|
||||
else
|
||||
verbose "NOT configuring eth0 for DHCP"
|
||||
fi
|
||||
|
@@ -1,3 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
CONFIG=/etc/plymouth/plymouthd.conf
|
||||
|
||||
if [ -f "$CONFIG" ]; then
|
||||
grep -q '^Theme=' "$CONFIG" || sed -i 's/#\([T\[]\)/\1/' "$CONFIG"
|
||||
fi
|
||||
|
||||
cp -a /usr/share/plymouth/default-install-duration /var/lib/plymouth/boot-duration
|
||||
|
@@ -8,7 +8,7 @@ use/power:
|
||||
|
||||
# modern power management
|
||||
use/power/acpi: use/power
|
||||
@$(call add,COMMON_PACKAGES,acpid)
|
||||
@$(call add,COMMON_PACKAGES,acpid acpi)
|
||||
|
||||
use/power/acpi/button: use/power/acpi
|
||||
@$(call add,COMMON_PACKAGES,acpid-events-power)
|
||||
|
@@ -18,12 +18,12 @@ sshd
|
||||
"
|
||||
|
||||
for i in $ENABLE; do
|
||||
[ -x /bin/systemctl ] && /bin/systemctl enable ${i}.service
|
||||
[ -x /bin/systemctl ] && /bin/systemctl --no-reload enable ${i}.service
|
||||
[ -x /sbin/chkconfig ] && /sbin/chkconfig $i on
|
||||
done
|
||||
|
||||
for i in $DISABLE; do
|
||||
[ -x /bin/systemctl ] && /bin/systemctl disable ${i}.service
|
||||
[ -x /bin/systemctl ] && /bin/systemctl --no-reload disable ${i}.service
|
||||
[ -x /sbin/chkconfig ] && /sbin/chkconfig $i off
|
||||
done
|
||||
:
|
||||
|
@@ -2,5 +2,13 @@
|
||||
# prepare base make-initrd configuration for stage1
|
||||
# see also http://www.altlinux.org/Make-initrd-propagator
|
||||
|
||||
sed -i 's/AUTODETECT/#&/' /etc/initrd.mk
|
||||
MAKE_INITRD_VER="`make-initrd -V \
|
||||
| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
|
||||
|
||||
if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.8.1"`" != "-1" ]; then
|
||||
echo 'AUTODETECT =' >> /etc/initrd.mk # make-initrd >= 0.8.1
|
||||
else
|
||||
sed -i 's/AUTODETECT/#&/' /etc/initrd.mk # see also #28578
|
||||
fi
|
||||
|
||||
echo 'FEATURES += propagator' >> /etc/initrd.mk
|
||||
|
@@ -82,7 +82,7 @@ bootargs: clean
|
||||
|
||||
clean: copy
|
||||
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
|
||||
sed -i "s,\^,," $(DSTDIR)/*.cfg; \
|
||||
sed -i "s/\^//;/menu label /d" $(DSTDIR)/*.cfg; \
|
||||
fi
|
||||
|
||||
copy: prep
|
||||
|
@@ -1,7 +1,7 @@
|
||||
+icewm: use/x11/icewm; @:
|
||||
+razorqt: use/x11/razorqt use/x11/lightdm/qt; @:
|
||||
+tde: use/x11/tde use/x11/kdm; @:
|
||||
+kde: use/x11/kde use/x11/kdm4; @:
|
||||
+kde4-lite: use/x11/kde4-lite use/x11/kdm4; @:
|
||||
|
||||
use/x11/xorg:
|
||||
@$(call add_feature)
|
||||
@@ -16,7 +16,7 @@ use/x11/drm: use/x11/xorg
|
||||
use/x11/3d-free: use/x11/drm
|
||||
@$(call add,THE_KMODULES,drm-nouveau)
|
||||
|
||||
### fglrx is broken with xorg-1.12 so far
|
||||
### fglrx is broken with xorg-1.13 so far
|
||||
use/x11/3d-proprietary: use/x11/xorg
|
||||
@$(call add,THE_KMODULES,fglrx nvidia)
|
||||
@$(call add,THE_PACKAGES,nvidia-settings nvidia-xconfig)
|
||||
@@ -52,8 +52,8 @@ use/x11/razorqt: use/x11/xorg
|
||||
use/x11/tde: use/x11/xorg
|
||||
@$(call add,THE_LISTS,$(call tags,tde desktop))
|
||||
|
||||
use/x11/kde: use/x11/xorg
|
||||
@$(call add,THE_LISTS,$(call tags,kde desktop))
|
||||
use/x11/kde4-lite: use/x11/xorg
|
||||
@$(call add,THE_LISTS,$(call tags,kde4 desktop))
|
||||
|
||||
use/x11/kde4: use/x11/xorg
|
||||
@$(call add,THE_PACKAGES,kde4-default)
|
||||
@@ -72,3 +72,6 @@ use/x11/e17: use/x11/xorg use/x11/3d-free
|
||||
|
||||
use/x11/lxde: use/x11/xorg
|
||||
@$(call add,THE_LISTS,$(call tags,lxde desktop))
|
||||
|
||||
use/x11/fvwm: use/x11/xorg
|
||||
@$(call add,THE_LISTS,$(call tags,fvwm desktop))
|
||||
|
2
image.in/.gitignore
vendored
2
image.in/.gitignore
vendored
@@ -1 +1,3 @@
|
||||
build.log
|
||||
reports
|
||||
out
|
||||
|
@@ -29,8 +29,11 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
|
||||
$(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
|
||||
endif
|
||||
|
||||
# glob it just in case
|
||||
IMAGEDIR := $(wildcard $(IMAGEDIR))
|
||||
|
||||
# additional means to reduce havoc in IMAGEDIR
|
||||
IMAGE_SORTDIR := $(SORTDIR)
|
||||
IMAGE_SORTDIR := $(wildcard $(SORTDIR))
|
||||
|
||||
# reconstruct instead of passing yet another variable
|
||||
IMAGE_OUTDIR := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)
|
||||
|
@@ -42,7 +42,7 @@ IMAGEDIR ?= $(shell \
|
||||
fi; \
|
||||
)
|
||||
|
||||
LOGDIR ?= $(IMAGEDIR)
|
||||
LOGDIR ?= $(wildcard $(IMAGEDIR))
|
||||
|
||||
# actual build starter
|
||||
# NB: our output MUST go into stderr to escape POSTPROC
|
||||
|
@@ -1,10 +0,0 @@
|
||||
ifndef MKIMAGE_PROFILES
|
||||
$(error this makefile is designed to be included in toplevel one)
|
||||
endif
|
||||
|
||||
# choose std kernel flavour for max RAM size support
|
||||
ifeq (i586,$(ARCH))
|
||||
BIGRAM := std-pae
|
||||
else
|
||||
BIGRAM := std-def
|
||||
endif
|
@@ -65,7 +65,7 @@ profile/init: distclean
|
||||
fi >&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
mp-commit "$(BUILDDIR)" "derivative profile initialized"; \
|
||||
mp-commit -i "$(BUILDDIR)" "derivative profile initialized"; \
|
||||
if [ -w . ]; then \
|
||||
rm -f "$(SYMLINK)" && \
|
||||
ln -s "$(BUILDDIR)" "$(SYMLINK)" && \
|
||||
@@ -82,8 +82,8 @@ profile/bare: profile/init
|
||||
} >&2
|
||||
@$(call try,MKIMAGE_PREFIX,/usr/share/mkimage)
|
||||
@$(call try,GLOBAL_VERBOSE,)
|
||||
@$(call try,IMAGEDIR,$(IMAGEDIR))
|
||||
@$(call try,LOGDIR,$(LOGDIR))
|
||||
@$(call try,IMAGEDIR,$(wildcard $(IMAGEDIR)))
|
||||
@$(call try,LOGDIR,$(wildcard $(LOGDIR)))
|
||||
@$(call try,BRANDING,altlinux-sisyphus)
|
||||
ifeq (,$(REPO:altlinux%=))
|
||||
@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)
|
||||
|
6
main.mk
6
main.mk
@@ -34,6 +34,12 @@ include $(sort $(wildcard lib/*.mk))
|
||||
include conf.d/*.mk
|
||||
include features.in/*/config.mk
|
||||
|
||||
# ensure the outdir is created and globbable
|
||||
ifdef IMAGEDIR
|
||||
$(shell mkdir -p $(IMAGEDIR))
|
||||
IMAGEDIR := $(wildcard $(IMAGEDIR))
|
||||
endif
|
||||
|
||||
# FIXME: this is buggy since *.mk can expose parts conditionally
|
||||
# (e.g. test.mk does DEBUG-only bits) and these will fail
|
||||
DISTRO_TARGETS := $(shell sed -n 's,^\(distro/[^:.]\+\):.*$$,\1,p' \
|
||||
|
23
pkg.in/lists/domain-client
Normal file
23
pkg.in/lists/domain-client
Normal file
@@ -0,0 +1,23 @@
|
||||
pam_mount
|
||||
|
||||
samba4-client
|
||||
cifs-utils
|
||||
keyutils
|
||||
nfs-clients
|
||||
autofs
|
||||
installer-feature-auto-domain
|
||||
installer-feature-nfs-client-stage3
|
||||
installer-feature-start-avahi
|
||||
installer-feature-network-shares-client-stage3
|
||||
installer-feature-weak-passwd
|
||||
libnss-fallback
|
||||
libnss-mdns
|
||||
|
||||
krb5-ticket-watcher
|
||||
|
||||
alterator-browser-qt
|
||||
alterator-standalone
|
||||
|
||||
alterator-auth
|
||||
alterator-net-shares
|
||||
|
2
pkg.in/lists/homeros/homeros
Normal file
2
pkg.in/lists/homeros/homeros
Normal file
@@ -0,0 +1,2 @@
|
||||
homeros-core
|
||||
homeros-live-data
|
@@ -1,5 +1,6 @@
|
||||
gdisk
|
||||
parted
|
||||
fatresize
|
||||
dosfstools
|
||||
grub2-efi
|
||||
elilo
|
||||
|
19
pkg.in/lists/tagged/base+regular
Normal file
19
pkg.in/lists/tagged/base+regular
Normal file
@@ -0,0 +1,19 @@
|
||||
openssh
|
||||
net-tools
|
||||
|
||||
strace
|
||||
powertop
|
||||
acpi
|
||||
|
||||
livecd-online-repo
|
||||
apt-repo
|
||||
update-kernel
|
||||
synaptic-usermode
|
||||
eepm
|
||||
|
||||
alterator-standalone
|
||||
cpufreq-simple
|
||||
xdg-user-dirs
|
||||
firefox-ru
|
||||
uvcview
|
||||
eject
|
@@ -1,3 +1,2 @@
|
||||
gnome3-default
|
||||
libreoffice libreoffice-gnome libreoffice-langpack-ru
|
||||
cinnamon-regular
|
||||
gimp
|
||||
|
@@ -3,4 +3,5 @@ gst-ffmpeg
|
||||
gnome-mplayer
|
||||
|
||||
econnman
|
||||
connman
|
||||
|
||||
e17-extra-modules
|
||||
|
6
pkg.in/lists/tagged/desktop+fvwm
Normal file
6
pkg.in/lists/tagged/desktop+fvwm
Normal file
@@ -0,0 +1,6 @@
|
||||
fvwm
|
||||
fvwm-doc
|
||||
fvwm-icons
|
||||
fvwm-themes
|
||||
fvwm-crystal
|
||||
xterm
|
@@ -3,4 +3,6 @@ xinit
|
||||
xinitrc
|
||||
livecd-setlocale
|
||||
installer-feature-runlevel5-stage3
|
||||
os-prober
|
||||
sudo
|
||||
su
|
||||
|
@@ -1,6 +1,7 @@
|
||||
openbox
|
||||
|
||||
pcmanfm2
|
||||
eject
|
||||
|
||||
lxde-common
|
||||
lxde-lxpanel
|
||||
@@ -16,4 +17,7 @@ lxde-lxshortcut
|
||||
menu-cache
|
||||
altlinux-freedesktop-menu-lxde
|
||||
|
||||
# NB: an lxde-settings is required by lxde-common
|
||||
lxde-settings-altlinux
|
||||
|
||||
tango-icon-theme
|
||||
|
@@ -1,8 +1,8 @@
|
||||
tango-icon-theme-extras
|
||||
|
||||
# lxterminal is reportedly sub-par (gns@) but official (aen@)
|
||||
lxde-lxterminal
|
||||
#sakura
|
||||
#lxde-lxterminal
|
||||
sakura
|
||||
fonts-bitmap-terminus
|
||||
|
||||
leafpad
|
||||
galculator
|
||||
|
@@ -1,3 +1,5 @@
|
||||
mate-default
|
||||
|
||||
altlinux-freedesktop-menu-mate
|
||||
mate-conf-gtk
|
||||
mate-control-center
|
||||
@@ -29,7 +31,7 @@ mate-document-viewer-djvu
|
||||
mate-file-archiver
|
||||
mate-image-viewer
|
||||
mate-media
|
||||
mate-media-apps
|
||||
#mate-media-apps
|
||||
mate-netspeed
|
||||
mate-power-manager
|
||||
mate-screensaver
|
||||
|
@@ -1,6 +1,6 @@
|
||||
NetworkManager
|
||||
NetworkManager-gnome
|
||||
wpa_gui
|
||||
NetworkManager-l2tp-gnome
|
||||
rfkill
|
||||
dbus-tools-gui
|
||||
fonts-ttf-droid
|
||||
|
Reference in New Issue
Block a user