forked from altcloud/mkimage-profiles
Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
a5ec5f2577 | ||
|
5e9ba6fb1a | ||
|
e179176b28 | ||
|
edd959e182 | ||
|
09cb29cb36 | ||
|
99a25867b2 | ||
|
6ba5e45fbe | ||
|
bd427df77a | ||
|
06b9785816 | ||
|
595dfc2d02 | ||
|
653b8e1df8 | ||
|
12340b3165 | ||
|
165059b1bd | ||
|
0efba3e42c | ||
|
6a6a0e1c01 | ||
|
6aa5402d8b | ||
|
a1119b74fe | ||
|
e6c59ac3f3 | ||
|
6711fd92db | ||
|
c30490e2e8 | ||
|
45cddfd25a | ||
|
5300949cc5 |
@@ -1,5 +1,5 @@
|
||||
Name: mkimage-profiles
|
||||
Version: 0.8.6
|
||||
Version: 0.9.0
|
||||
Release: alt1
|
||||
|
||||
Summary: ALT Linux based distribution metaprofile
|
||||
@@ -15,10 +15,10 @@ BuildRequires: rsync asciidoc-a2x xmlgraphics-fop fonts-ttf-dejavu
|
||||
BuildRequires: /proc
|
||||
|
||||
Requires: rsync git-core
|
||||
Requires: time schedutils
|
||||
Requires: time schedutils sfdisk
|
||||
Requires: mkimage >= 0.2.0
|
||||
|
||||
# Recommends: graphviz
|
||||
# Recommends: graphviz qemu-img
|
||||
|
||||
%define mpdir %_datadir/%name
|
||||
%add_findreq_skiplist %mpdir/*.in/*
|
||||
@@ -78,6 +78,13 @@ cp -a * %buildroot%mpdir
|
||||
%doc %docs/*
|
||||
|
||||
%changelog
|
||||
* Mon Nov 19 2012 Michael Shigorin <mike@altlinux.org> 0.9.0-alt1
|
||||
- initial uefi, luks, armh support
|
||||
- enhanced arm, gnome3/systemd, vm support
|
||||
|
||||
* Sun Nov 11 2012 Michael Shigorin <mike@altlinux.org> 0.8.7-alt1
|
||||
- regressions--
|
||||
|
||||
* Mon Nov 05 2012 Michael Shigorin <mike@altlinux.org> 0.8.6-alt1
|
||||
- docs subpackage (HTML/PDF book)
|
||||
|
||||
|
6
.gear/tags/716e6c41900fff1738ded5752ee5bb98f325e4b5
Normal file
6
.gear/tags/716e6c41900fff1738ded5752ee5bb98f325e4b5
Normal file
@@ -0,0 +1,6 @@
|
||||
object a1119b74fe81a2e1bca8901930471c98b3dc6564
|
||||
type commit
|
||||
tag v0.8.7
|
||||
tagger Michael Shigorin <mike@altlinux.org> 1352664612 +0400
|
||||
|
||||
regressions--
|
@@ -1,6 +0,0 @@
|
||||
object 91a4cc986fcc061bed80a3c8f7cee114b8986db1
|
||||
type commit
|
||||
tag v0.8.5
|
||||
tagger Michael Shigorin <mike@altlinux.org> 1351541298 +0200
|
||||
|
||||
diffable logs
|
@@ -1 +1 @@
|
||||
88fce54e081dd8b4d8664f30193e8ce371d172b2 v0.8.5
|
||||
716e6c41900fff1738ded5752ee5bb98f325e4b5 v0.8.7
|
||||
|
3
Makefile
3
Makefile
@@ -10,7 +10,8 @@ ifndef ARCHES
|
||||
ifdef ARCH
|
||||
ARCHES := $(ARCH)
|
||||
else
|
||||
ARCHES := $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
|
||||
ARCHES := $(shell arch \
|
||||
| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
|
||||
endif
|
||||
endif
|
||||
export ARCHES
|
||||
|
12
bin/tar2vm
12
bin/tar2vm
@@ -42,7 +42,7 @@ ROOTFSTYPE="${4:-ext4}"
|
||||
ROOTDEV="/dev/sda1"
|
||||
|
||||
# last preparations...
|
||||
for i in losetup parted kpartx mkfs."$ROOTFSTYPE"; do
|
||||
for i in losetup sfdisk parted kpartx mkfs."$ROOTFSTYPE"; do
|
||||
if ! type -t "$i" >&/dev/null; then
|
||||
fatal "$i required but not found"
|
||||
fi
|
||||
@@ -98,8 +98,8 @@ chroot "$ROOTFS" make-initrd -k "$KERNEL"
|
||||
sed -i "s,$LOOPDEV1,$ROOTDEV," "$ROOTFS/etc/fstab"
|
||||
|
||||
# configure and install bootloader
|
||||
REGEXP='^([0-9]+) heads, ([0-9]+) sectors/track, ([0-9]+) cylinders.*$'
|
||||
set -- $(fdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
|
||||
REGEXP='^Disk .*: ([0-9]+) cylinders, ([0-9]+) heads, ([0-9]+) sectors/track*$'
|
||||
set -- $(sfdisk -l "$LOOPDEV" | grep -E "$REGEXP" | sed -r "s@$REGEXP@\1 \2 \3@")
|
||||
|
||||
LILO_COMMON="lba32
|
||||
delay=1
|
||||
@@ -113,9 +113,9 @@ cat > "$ROOTFS"/etc/lilo-loop.conf << EOF
|
||||
boot=$LOOPDEV
|
||||
disk=$LOOPDEV
|
||||
bios=0x80
|
||||
heads=$1
|
||||
sectors=$2
|
||||
cylinders=$3
|
||||
cylinders=$1
|
||||
heads=$2
|
||||
sectors=$3
|
||||
partition=$LOOPDEV1
|
||||
start=63
|
||||
$LILO_COMMON
|
||||
|
@@ -3,9 +3,12 @@ ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
distro/dos: distro/.init use/dos use/syslinux/ui/menu; @:
|
||||
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @:
|
||||
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-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
|
||||
@@ -29,7 +32,7 @@ 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-tde: distro/.live-desktop use/live/ru use/live/install +tde; @:
|
||||
distro/live-tde: distro/.live-desktop-ru use/live/install +tde; @:
|
||||
|
||||
distro/live-rescue: distro/live-icewm
|
||||
@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
|
||||
@@ -54,15 +57,17 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
|
||||
@$(call add,LIVE_PACKAGES,FlightGear fgo input-utils)
|
||||
@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)
|
||||
|
||||
distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \
|
||||
distro/live-gnome: distro/.live-desktop-ru use/systemd use/live/nodm use/x11/3d-proprietary
|
||||
@$(call add,LIVE_PACKAGES,gnome3-default)
|
||||
|
||||
distro/live-cinnamon: distro/.live-desktop-ru use/live/autologin \
|
||||
use/x11/cinnamon use/x11/3d-proprietary; @:
|
||||
|
||||
distro/live-mate: distro/.live-desktop use/live/nodm use/live/ru use/x11/3d-free
|
||||
distro/live-mate: distro/.live-desktop-ru use/live/nodm use/x11/3d-free
|
||||
@$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate))
|
||||
@$(call set,KFLAVOURS,un-def) # the newest one
|
||||
|
||||
distro/live-enlightenment: distro/.live-desktop use/live/autologin \
|
||||
use/live/ru use/x11/3d-free
|
||||
distro/live-enlightenment: distro/.live-desktop-ru use/live/autologin use/x11/3d-free
|
||||
@$(call add,LIVE_PACKAGES,enlightenment)
|
||||
|
||||
distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru
|
||||
|
@@ -3,9 +3,6 @@ ifneq (,$(DEBUG))
|
||||
|
||||
ifeq (distro,$(IMAGE_CLASS))
|
||||
|
||||
distro/syslinux: distro/.init \
|
||||
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
|
||||
|
||||
distro/syslinux-auto: distro/.init use/hdt use/syslinux/timeout/1; @:
|
||||
distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @:
|
||||
|
||||
@@ -22,6 +19,12 @@ 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)
|
||||
|
||||
distro/server-systemd: distro/server-mini use/systemd
|
||||
@$(call set,KFLAVOURS,std-def)
|
||||
|
||||
@@ -33,6 +36,7 @@ distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
|
||||
use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest
|
||||
@$(call add,SYSLINUX_CFG,netinstall2)
|
||||
|
||||
distro/desktop-luks: distro/icewm use/luks; @:
|
||||
distro/desktop-systemd: distro/icewm use/systemd; @:
|
||||
distro/desktop-plymouth: distro/icewm +plymouth; @:
|
||||
distro/live-mate-systemd: distro/live-mate use/systemd use/live/install; @:
|
||||
|
6
features.in/efi/README
Normal file
6
features.in/efi/README
Normal file
@@ -0,0 +1,6 @@
|
||||
Фича добавляет в образы необходимое для поддержки EFI/UEFI.
|
||||
|
||||
См. тж.:
|
||||
* http://www.altlinux.org/UEFI
|
||||
* http://www.rodsbooks.com/efi-bootloaders/
|
||||
* https://bugzilla.altlinux.org/showdependencytree.cgi?id=27804
|
7
features.in/efi/config.mk
Normal file
7
features.in/efi/config.mk
Normal file
@@ -0,0 +1,7 @@
|
||||
use/efi:
|
||||
@$(call add,THE_LISTS,$(call tags,base efi))
|
||||
@$(call add,INSTALL2_PACKAGES,dosfstools)
|
||||
|
||||
use/efi/debug: use/efi
|
||||
@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
|
||||
@$(call set,KFLAVOURS,led-ws) ### CONFIG_FB_EFI
|
4
features.in/efi/stage2/image-scripts.d/50-efi
Executable file
4
features.in/efi/stage2/image-scripts.d/50-efi
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
# see also https://bugzilla.altlinux.org/27970
|
||||
|
||||
echo efivars >> /etc/modules
|
@@ -19,11 +19,14 @@ rm -rf /usr/share/awk/
|
||||
### TODO: x11vnc, xorg-xvfb: fix installer-common-stage2
|
||||
rpmquery -a cpp\* gcc\* perl-base file ipv6calc \
|
||||
bind-utils libbind \
|
||||
gnupg libgcrypt libgnutls\* libgpg-error libsoup\* \
|
||||
libsoup\* \
|
||||
libGL glxinfo xdriinfo \
|
||||
make make-initrd x11vnc xorg-xvfb \
|
||||
| xargs -r rpmi -e --nodeps --
|
||||
|
||||
### TODO: unless LUKS luks feature is requested we can also drop
|
||||
### gnupg libgcrypt libgnutls\* libgpg-error
|
||||
|
||||
rpmquery -a bind-utils libbind \
|
||||
| xargs -r rpmi -e --
|
||||
|
||||
|
@@ -17,7 +17,7 @@ rm -rf /lib/modules/*/kernel/drivers/char/{ipmi,hw_random,mwave,tpm}
|
||||
rm -rf /lib/modules/*/kernel/drivers/char/watchdog
|
||||
rm -rf /lib/modules/*/kernel/drivers/cpufreq
|
||||
rm -rf /lib/modules/*/kernel/drivers/edac
|
||||
rm -rf /lib/modules/*/kernel/drivers/firmware ###
|
||||
#rm -rf /lib/modules/*/kernel/drivers/firmware ### EFI
|
||||
rm -rf /lib/modules/*/kernel/drivers/gpio
|
||||
rm -rf /lib/modules/*/kernel/drivers/hwmon
|
||||
rm -rf /lib/modules/*/kernel/drivers/infiniband ###
|
||||
|
@@ -1,9 +1,28 @@
|
||||
#!/bin/sh
|
||||
# see also m-p-d::profiles/live/image-scripts.d/init3-services
|
||||
|
||||
[ -x /sbin/chkconfig ] || exit 0
|
||||
[ -x /sbin/chkconfig -o -x /bin/systemctl ] || exit 0
|
||||
|
||||
switch() {
|
||||
case "$2" in
|
||||
on)
|
||||
cc=on; sc=enable;;
|
||||
off)
|
||||
cc=off; sc=disable;;
|
||||
esac
|
||||
|
||||
{
|
||||
[ ! -x /bin/systemctl ] || /bin/systemctl $sc $1.service
|
||||
[ ! -x /sbin/chkconfig ] || /sbin/chkconfig $1 $cc
|
||||
} 2>/dev/null
|
||||
}
|
||||
|
||||
ENABLE="
|
||||
dm
|
||||
gdm
|
||||
kdm
|
||||
wdm
|
||||
prefdm
|
||||
alteratord
|
||||
livecd-evms
|
||||
livecd-fstab
|
||||
@@ -37,6 +56,6 @@ update_wms
|
||||
xinetd
|
||||
"
|
||||
|
||||
for i in $ENABLE; do chkconfig $i on 2>/dev/null; done
|
||||
for i in $DISABLE; do chkconfig $i off 2>/dev/null; done
|
||||
for i in $ENABLE; do switch $i on; done
|
||||
for i in $DISABLE; do switch $i off; done
|
||||
:
|
||||
|
2
features.in/luks/README
Normal file
2
features.in/luks/README
Normal file
@@ -0,0 +1,2 @@
|
||||
Эта секретная фича добавляет в инсталяторы поддержку
|
||||
шифрования файловых систем с помощью LUKS при их создании.
|
2
features.in/luks/config.mk
Normal file
2
features.in/luks/config.mk
Normal file
@@ -0,0 +1,2 @@
|
||||
use/luks:
|
||||
@$(call add,BASE_PACKAGES,make-initrd-luks cryptsetup)
|
4
features.in/luks/stage1/scripts.d/11-initrd-luks
Executable file
4
features.in/luks/stage1/scripts.d/11-initrd-luks
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
# FIXME: move into luks feature
|
||||
echo 'FEATURES += luks' >> /etc/initrd.mk
|
@@ -16,7 +16,7 @@ else
|
||||
endif
|
||||
|
||||
# virtual environments
|
||||
VE_ARCHIVES := tar cpio
|
||||
VE_ARCHIVES := tar cpio ubifs
|
||||
VE_COMPRESSORS := gz xz# there's no sense in bzip2 by now
|
||||
VE_ZIPS := $(call addsuffices, \
|
||||
$(addprefix .,$(VE_COMPRESSORS)), \
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh -efux
|
||||
# NB: /etc/initrd.mk carefully prepared by earlier scripts
|
||||
|
||||
verbose() { [ -n "$GLOBAL_VERBOSE" ] && echo "** 80-make-initfs: $@" >&2; }
|
||||
verbose() { [ -z "$GLOBAL_VERBOSE" ] || echo "** 80-make-initfs: $@" >&2; }
|
||||
|
||||
kver="$(rpm -qa 'kernel-image*' \
|
||||
--qf '%{installtime} %{version}-%{name}-%{release}\n' \
|
||||
@@ -23,13 +23,10 @@ fi
|
||||
|
||||
if make-initrd $MAKE_INITRD_OPTS; then
|
||||
pdir="$(getconf LIBDIR)/propagator"
|
||||
if [ -d "$pdir" ]; then # p5/t6
|
||||
verbose "$pdir exists"
|
||||
gzip < /boot/initrd-$kver.img > "$pdir"/initfs
|
||||
else
|
||||
verbose "$pdir missing, no-op"
|
||||
fi
|
||||
mkdir -p "$pdir"
|
||||
gzip < /boot/initrd-$kver.img > "$pdir"/initfs
|
||||
else
|
||||
verbose "make-initrd failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@@ -21,10 +21,12 @@ LOWSPACE = 1024
|
||||
START += time -f "%E %PCPU %Mk"
|
||||
|
||||
# /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
|
||||
# armh (armv7l) doesn't have any but should cope with qemu-arm.static;
|
||||
# also check whether non-x86 build is running native
|
||||
EARCH := $(subst armh,arm,$(ARCH))
|
||||
ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
|
||||
ifeq (,$(findstring $(ARCH),$(shell uname -m)))
|
||||
export GLOBAL_HSH_USE_QEMU=$(ARCH)
|
||||
ifeq (,$(findstring $(EARCH),$(shell uname -m)))
|
||||
export GLOBAL_HSH_USE_QEMU=$(EARCH)
|
||||
endif
|
||||
else
|
||||
START += $(ARCH)
|
||||
|
@@ -56,7 +56,7 @@ profile/init: distclean
|
||||
| tee $(BUILDDIR)/sources.list; \
|
||||
echo; \
|
||||
} $(LOG); \
|
||||
if ! grep -q "[ ]$(ARCH)[ ]" $(BUILDDIR)/sources.list; then \
|
||||
if ! grep -q "\<$(ARCH)\>" $(BUILDDIR)/sources.list; then \
|
||||
echo -n "requested arch '$$ARCH' unavailable" >&2; \
|
||||
if [ -z "$(APTCONF)" ]; then \
|
||||
echo " (no APTCONF)"; \
|
||||
|
7
pkg.in/lists/tagged/base+efi
Normal file
7
pkg.in/lists/tagged/base+efi
Normal file
@@ -0,0 +1,7 @@
|
||||
gdisk
|
||||
parted
|
||||
dosfstools
|
||||
grub2-efi
|
||||
elilo
|
||||
efibootmgr
|
||||
installer-feature-efi-stage3
|
@@ -128,6 +128,9 @@ ne.ko
|
||||
netconsole.ko
|
||||
netwave_cs.ko
|
||||
nfs.ko
|
||||
nfsv2.ko
|
||||
nfsv3.ko
|
||||
nfsv4.ko
|
||||
ni52.ko
|
||||
ni65.ko
|
||||
nls_cp866.ko
|
||||
|
Reference in New Issue
Block a user