Commit ffe6f140b4269c8015609e6c0ed3cf919c293f44

Authored by Silvan Calarco
1 parent e80fbab768
Exists in master

Sync to current openmamba target

Showing 17 changed files with 173 additions and 11 deletions Side-by-side Diff

... ... @@ -4,14 +4,14 @@
4 4 @[ "$(RELEASE)" = "devel" -o "$(RELEASE)" = "" ] && echo -n "openmamba-devel "; \
5 5 :
6 6 $(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline glibc \
7   - ncurses initscripts setup coreutils rootfiles chkconfig \
8   - udev ttf-freefont libpython libgpm debianutils
  7 + ncurses systemd setup coreutils rootfiles chkconfig \
  8 + udev debianutils openmamba-release
9 9 # splashutils
10 10 $(MAKEDIST_TARGET)-firmwares: ipw2100-firmware ipw2200-firmware zd1211-firmware radeon-firmware \
11 11 rt2501-firmware rt2860-firmware rt2870-firmware r5u87x-firmware
12 12 $(MAKEDIST_TARGET)-commontools: $(_init_system) util-linux kmod \
13 13 procps sed grep tar bzip2 unzip zip pciutils lshw \
14   - pam shadow-common pwdutils acpid mingetty screen \
  14 + pam shadow-common pwdutils acpid screen \
15 15 net-tools prelink mc dhcpclient timezone nfs-utils \
16 16 wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
17 17 dosfstools man mbr iptables cups vim iputils sudo postplug less \
... ... @@ -24,15 +24,15 @@
24 24 if [ ! "$MULTILANGUAGE" ]; then
25 25 cat > $MOUNTDIR/etc/vconsole.conf << _EOF
26 26 KEYMAP=$KEYMAP
27   -FONT=lat9w-16
28   -FONT_MAP=8859-1_to_uni
  27 +FONT=LatGrkCyr-8x16
  28 +FONT_MAP=latin2u
29 29 FONT_UNIMAP=
30 30 UNICODE=1
31 31 _EOF
32 32 else
33 33 cat > $MOUNTDIR/etc/vconsole.conf << _EOF
34   -FONT=lat9w-16
35   -FONT_MAP=8859-1_to_uni
  34 +FONT=LatGrkCyr-8x16
  35 +FONT_MAP=latin2u
36 36 FONT_UNIMAP=
37 37 UNICODE=1
38 38 _EOF
platforms/livecd-gnome-root/post.inc.sh
... ... @@ -8,6 +8,11 @@
8 8 # FIXME: ensure alternatives are correclty set
9 9 chroot $MOUNTDIR update-alternatives-set-dri
10 10  
  11 +# install icon on liveuser desktop
  12 +chroot $MOUNTDIR cp /usr/share/applications/openmamba-installer.desktop /home/liveuser/Desktop/
  13 +chroot $MOUNTDIR chmod +x /home/liveuser/Desktop/openmamba-installer.desktop
  14 +chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.desktop
  15 +
11 16 # clean rpm database before doing other operations with internal rpm
12 17 # to fix cross x86/x86_64 installation error:
13 18 # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
platforms/livecd-light-root/post.inc.sh
1 1 # FIXME: ensure alternatives are correclty set
2 2 chroot $MOUNTDIR update-alternatives-set-dri
3 3  
  4 +# install icon on liveuser desktop
  5 +chroot $MOUNTDIR cp /usr/share/applications/openmamba-installer.desktop /home/liveuser/Desktop/
  6 +chroot $MOUNTDIR chmod +x /home/liveuser/Desktop/openmamba-installer.desktop
  7 +chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.desktop
  8 +
4 9 # clean rpm database before doing other operations with internal rpm
5 10 # to fix cross x86/x86_64 installation error:
6 11 # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
platforms/livecd-root/post.inc.sh
... ... @@ -6,6 +6,11 @@
6 6 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1
7 7 done
8 8  
  9 +# install icon on liveuser desktop
  10 +chroot $MOUNTDIR cp /usr/share/applications/openmamba-installer.desktop /home/liveuser/Desktop/
  11 +chroot $MOUNTDIR chmod +x /home/liveuser/Desktop/openmamba-installer.desktop
  12 +chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.desktop
  13 +
9 14 # clean rpm database before doing other operations with internal rpm
10 15 # to fix cross x86/x86_64 installation error:
11 16 # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
platforms/livecd/Makefile
1   -$(MAKEDIST_TARGET)-livecd: openmamba-release memtest86+ syslinux macbook-tools dracut
  1 +$(MAKEDIST_TARGET)-livecd: openmamba-release memtest86+ syslinux macbook-tools dracut grub-efi-x86_64
2 2 # Localized targets
3 3 $(MAKEDIST_TARGET)-livecd-en:
4 4 $(MAKEDIST_TARGET)-livecd-it:
platforms/livecd/post.inc.sh
... ... @@ -122,6 +122,47 @@
122 122 buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
123 123 sed -i "s|%buildinfo%|$buildinfo|" $MOUNTDIR2/boot/isolinux/menu.txt
124 124  
  125 +#
  126 +# EFI support section BEGIN
  127 +#
  128 +
  129 +# create EFI grub 32 and 64 bit images
  130 +mkdir -p $MOUNTDIR2/EFI/BOOT/
  131 +grub-mkimage -o $MOUNTDIR2/EFI/BOOT/bootx64.efi -O x86_64-efi -p /EFI/BOOT \
  132 + part_gpt part_msdos ntfs ntfscomp hfsplus fat ext2 normal chain boot linux echo \
  133 + help gfxterm gettext png efi_gop efi_uga search search_label search_fs_uuid \
  134 + iso9660 configfile || {
  135 + errorAndExit $"Error: unable to create GRUB x86_64-efi image"
  136 +}
  137 +
  138 +# basic extlinux.conf -> grub.cfg conversion
  139 +echo "search --no-floppy --label --set=root openmamba_live" > $MOUNTDIR2/EFI/BOOT/grub.cfg
  140 +while read line; do
  141 + case $line in
  142 + "MENU LABEL "*) [ "$CURR_BRACKET_OPEN" = "1" ] && echo "}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  143 + echo "menuentry \"${line/MENU LABEL }\" {" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  144 + CURR_BRACKET_OPEN=1
  145 + ;;
  146 + "kernel "*) CURR_KERNEL="${line/kernel }"
  147 + echo "echo \"Loading ${CURR_KERNEL}\"" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  148 + ;;
  149 + "append "*) set -- ${line/append initrd=}
  150 + CURR_INITRD="$1"
  151 + CURR_CMDLINE="${line/append initrd=$CURR_INITRD}"
  152 + echo "linux ${CURR_KERNEL} ${CURR_CMDLINE}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  153 + echo "echo \"Loading ${CURR_INITRD}\"" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  154 + echo "initrd ${CURR_INITRD}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  155 + echo "}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  156 + CURR_BRACKET_OPEN=0
  157 + ;;
  158 + esac
  159 +done < $MOUNTDIR2/boot/isolinux/isolinux.cfg
  160 +[ "$CURR_BRACKET_OPEN" = "1" ] && echo "}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  161 +
  162 +#
  163 +# EFI support section END
  164 +#
  165 +
125 166 #echo "Adding binary packages from pkggroups.db..."
126 167 #. $LOCALSTATEDIR/.${MEDIA_NAMES[0]}.distinfo
127 168 #LANG=${LANGUAGE:0:2} . $MOUNTDIR/usr/share/openmamba/pkggroups.db
platforms/livedvd-root/post.inc.sh
... ... @@ -6,6 +6,11 @@
6 6 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
7 7 done
8 8  
  9 +# install icon on liveuser desktop
  10 +chroot $MOUNTDIR cp /usr/share/applications/openmamba-installer.desktop /home/liveuser/Desktop/
  11 +chroot $MOUNTDIR chmod +x /home/liveuser/Desktop/openmamba-installer.desktop
  12 +chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.desktop
  13 +
9 14 # clean rpm database before doing other operations with internal rpm
10 15 # to fix cross x86/x86_64 installation error:
11 16 # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
platforms/livedvd/Makefile
1   -$(MAKEDIST_TARGET)-livedvd: openmamba-release memtest86+ syslinux macbook-tools
  1 +$(MAKEDIST_TARGET)-livedvd: openmamba-release memtest86+ syslinux macbook-tools dracut grub-efi-x86_64
2 2 # Localized targets
3 3 $(MAKEDIST_TARGET)-livedvd-en:
4 4 $(MAKEDIST_TARGET)-livedvd-it:
platforms/livedvd/post.inc.sh
... ... @@ -150,6 +150,47 @@
150 150 buildinfo="`cat $MOUNTDIR/etc/openmamba-release` [$PRODUCT_NAME build:`date +%c`]"
151 151 sed -i "s|%buildinfo%|$buildinfo|" $MOUNTDIR2/boot/isolinux/menu.txt
152 152  
  153 +#
  154 +# EFI support section BEGIN
  155 +#
  156 +
  157 +# create EFI grub 32 and 64 bit images
  158 +mkdir -p $MOUNTDIR2/EFI/BOOT/
  159 +grub-mkimage -o $MOUNTDIR2/EFI/BOOT/bootx64.efi -O x86_64-efi -p /EFI/BOOT \
  160 + part_gpt part_msdos ntfs ntfscomp hfsplus fat ext2 normal chain boot linux echo \
  161 + help gfxterm gettext png efi_gop efi_uga search search_label search_fs_uuid \
  162 + iso9660 configfile || {
  163 + errorAndExit $"Error: unable to create GRUB x86_64-efi image"
  164 +}
  165 +
  166 +# basic extlinux.conf -> grub.cfg conversion
  167 +echo "search --no-floppy --label --set=root openmamba_live" > $MOUNTDIR2/EFI/BOOT/grub.cfg
  168 +while read line; do
  169 + case $line in
  170 + "MENU LABEL "*) [ "$CURR_BRACKET_OPEN" = "1" ] && echo "}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  171 + echo "menuentry \"${line/MENU LABEL }\" {" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  172 + CURR_BRACKET_OPEN=1
  173 + ;;
  174 + "kernel "*) CURR_KERNEL="${line/kernel }"
  175 + echo "echo \"Loading ${CURR_KERNEL}\"" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  176 + ;;
  177 + "append "*) set -- ${line/append initrd=}
  178 + CURR_INITRD="$1"
  179 + CURR_CMDLINE="${line/append initrd=$CURR_INITRD}"
  180 + echo "linux ${CURR_KERNEL} ${CURR_CMDLINE}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  181 + echo "echo \"Loading ${CURR_INITRD}\"" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  182 + echo "initrd ${CURR_INITRD}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  183 + echo "}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  184 + CURR_BRACKET_OPEN=0
  185 + ;;
  186 + esac
  187 +done < $MOUNTDIR2/boot/isolinux/isolinux.cfg
  188 +[ "$CURR_BRACKET_OPEN" = "1" ] && echo "}" >> $MOUNTDIR2/EFI/BOOT/grub.cfg
  189 +
  190 +#
  191 +# EFI support section END
  192 +#
  193 +
153 194 #echo "Adding binary packages from pkggroups.db..."
154 195 #. $LOCALSTATEDIR/.${MEDIA_NAMES[0]}.distinfo
155 196 #LANG=${LANGUAGE:0:2} . $MOUNTDIR/usr/share/openmamba/pkggroups.db
platforms/rootfs-base/Makefile
  1 +$(MAKEDIST_TARGET)-$(PLATFORM)-arm:
  2 +
  3 +$(MAKEDIST_TARGET)-$(PLATFORM)-i586:
  4 +
  5 +$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64:
  6 +
  7 +$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
  8 + bash rpm smart
  9 +
  10 +# Localization targets
  11 +$(MAKEDIST_TARGET)-$(PLATFORM)-en:
  12 +
  13 +$(MAKEDIST_TARGET)-$(PLATFORM)-es:
  14 +
  15 +$(MAKEDIST_TARGET)-$(PLATFORM)-it:
platforms/rootfs-base/Makefile.defs
  1 +packagekitgui = gnome-packagekit
  2 +firewallgui = gui-ufw
platforms/rootfs-base/root/etc/dhcpd.conf
  1 +#ddns-update-style ad-hoc;
  2 +ignore client-updates;
  3 +
  4 +subnet 10.99.99.0 netmask 255.255.255.0 {
  5 +# --- default gateway
  6 +# option routers 192.168.0.254;
  7 +# option subnet-mask 255.255.255.0;
  8 +#
  9 +# option nis-domain "domain.it";
  10 +# option domain-name "domain.it";
  11 +# option domain-name-servers 192.168.0.254;
  12 +#
  13 +# option time-offset -18000; # Eastern Standard Time
  14 +# option ntp-servers 192.168.0.1;
  15 +# option netbios-name-servers 192.168.0.1;
  16 +# --- Selects point-to-point node (default is hybrid). Don't change this unless
  17 +# -- you understand Netbios very well
  18 +# option netbios-node-type 2;
  19 +#
  20 + range dynamic-bootp 10.99.99.100 10.99.99.199;
  21 + default-lease-time 21600;
  22 + max-lease-time 43200;
  23 +#
  24 +# # we want the nameserver to appear at a fixed address
  25 +# host ns {
  26 +# next-server dns.domain.it;
  27 +# hardware ethernet 01:23:45:67:89:AB;
  28 +# fixed-address 1.2.3.4;
  29 +# }
  30 +}
platforms/rootfs-base/root/etc/sysconfig/dhcpd
  1 +# Command line options here
  2 +DHCPDIFS="usb0"
  3 +DHCPDARGS=
platforms/rootfs-base/settings.inc
  1 +KERNEL_IGNORE=true
  2 +APPLICATION_TARGET=""
  3 +MEDIA=archive_xz
  4 +#INSTALL_PACKAGES="bash"
  5 +TARGET_HOSTNAME=openmamba-rootfs-base
  6 +#rpmextraargs="--noscripts"
  7 +#DEBUG=1
  8 +#DEVEL=1
  9 +KEEP_RPM=1
  10 +#RPM=rpm
platforms/rootfs-light/Makefile
... ... @@ -17,7 +17,7 @@
17 17 liblame expect prelink NetworkManager ModemManager NetworkManager-openvpn \
18 18 procps xorg-server x11vnc xkeyboard-config \
19 19 xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \
20   - dhcp-server rfkill plymouth livecd-tools rdesktop \
  20 + dhcp-server rfkill plymouth live-user-environment \
21 21 postplug-xorg postplug-sound gparted tar net-tools mambatray florence
22 22  
23 23 # startactive
platforms/rootfs/Makefile
... ... @@ -24,7 +24,7 @@
24 24 liblame expect prelink NetworkManager ModemManager procps \
25 25 xorg-server x11vnc xkeyboard-config screen \
26 26 xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \
27   - dhcp-server rfkill plymouth livecd-tools rdesktop mingetty \
  27 + dhcp-server rfkill plymouth live-user-environment \
28 28 postplug-xorg postplug-sound gparted tar net-tools mambatray kvkbd
29 29  
30 30 # startactive