Global sync with openmamba target

Makefile.defs

@@ -79,6 +79,7 @@ endif
 ifeq ($(ARCH),i586)
 # xorg
 xorglibGL = libGL-Mesa-dri
+libatiuki.so.1 = xorg-drv-video-fglrx
 # libGL-fglrx-X11 libGL-nvidia-X11
 xorglibglx = xorg-ext-libglx
 # xorg-ext-libglx-nvidia
@@ -98,6 +99,7 @@ endif
 ifeq ($(ARCH),x86_64)
 # xorg
 xorglibGL = libGL-Mesa-dri
+libatiuki.so.1[][64bit] = xorg-drv-video-fglrx
 # libGL-nvidia-X11 libGL-fglrx-X11
 xorglibglx = xorg-ext-libglx
 # xorg-ext-libglx-nvidia

makedist.inc.sh

@@ -2,13 +2,11 @@
 [ -e $TARGETDIR/platforms/$PLATFORM/pre.inc.sh ] && . $TARGETDIR/platforms/$PLATFORM/pre.inc.sh
 
 [ "$PRODUCT_NAME" ] && \
-   MEDIA_NAME=`PLATFORM=$PRODUCT_NAME media_name` ||
+   MEDIA_NAME=`PLATFORM=$PRODUCT_NAME VARIANT=$VARIANT medium_name` ||
-   MEDIA_NAME=`media_name`
+   MEDIA_NAME=`VARIANT=$VARIANT medium_name`
 
 #if [ "$FORCE" = "1" -o ! -e "$LOCALSTATEDIR/$MEDIA_NAME" ]; then
 
-[ $MEDIA = "raw" ] && create_raw_filesystem $LOCALSTATEDIR/$MEDIA_NAME $MEDIA_SIZE 1024k $ROOTFS
-
 #create_livecd
 initialize_root_dir
 create_rpm_database

platforms/diskimg/Makefile

@@ -0,0 +1,3 @@
+$(MAKEDIST_TARGET)-diskimg: openmamba-install-scripts
+$(MAKEDIST_TARGET)-diskimg-en:
+$(MAKEDIST_TARGET)-diskimg-it:

platforms/diskimg/post.inc.sh

@@ -0,0 +1,23 @@
+if [ "$MODE" = "rootfsinstall" ]; then
+   /usr/sbin/rootfsinstall -y $ROOTFSINSTALL_ADD $LOOPDEV \
+      $LOCALSTATEDIR/openmamba-rootfs-light-$LANGUAGE.$DEVICEARCH.tar.xz || \
+       { retcode=$?
+         echo "$makedist_me: fatal error, aborting installation" >&2
+         echo "$makedist_me: exit code was: $retcode" >&2
+         echo "$makedist_me: sleeping 600 seconds"
+         sleep 600
+         { (exit 1); exit 1; }; }
+elif [ "$MODE" = "usbinstall" ]; then
+   # FIXME: current hosting system requirements:
+   # grub-efi.i586 mactel-boot
+   /usr/sbin/usbinstall $LOOPDEV $LOCALSTATEDIR/openmamba-livecd-$LANGUAGE.$ARCH.iso -y || \
+       { retcode=$?
+         echo "$makedist_me: fatal error, aborting installation" >&2
+         echo "$makedist_me: exit code was: $retcode" >&2
+         echo "$makedist_me: sleeping 600 seconds"
+         sleep 600
+         { (exit 1); exit 1; }; }
+else
+   echo "$makedist_me: MODE is undefined; aborting."
+   { (exit 1); exit 1; };
+fi

platforms/diskimg/pre.inc.sh

@@ -0,0 +1,7 @@
+case $VARIANT in
+   bananapi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-bpi"; DEVICEARCH=arm; MEDIA_SIZE=1920 ;;
+   raspberrypi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-rpi"; DEVICEARCH=arm; MEDIA_SIZE=1920 ;;
+   cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox" DEVICEARCH=arm; MEDIA_SIZE=1920 ;;
+   livecd) MODE=usbinstall; ROOTFSINSTALL_ADD= ;;
+   *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ; DEVICEARCH=$ARCH ;;
+esac

platforms/diskimg/settings.inc

@@ -0,0 +1,12 @@
+# raw disk image
+MEDIA=raw
+MEDIA_SIZE=3584
+
+KERNEL_IGNORE=1
+DISTROMATIC=off
+
+if [ "$SUBPLATFORM" ]; then
+   PRODUCT_NAME=light
+   VARIANT=$SUBPLATFORM
+   SUBPLATFORM=
+fi

platforms/livecd-gnome-root/Makefile

@@ -26,7 +26,7 @@ $(MAKEDIST_TARGET)-livecd-gnome-root: \
                   chromium totem-mozilla-plugin \
                   macbook-tools livecd-tools \
                   Mesa-tools driconf parted testdisk \
-                  samba-server \
+                  samba-server vixie-cron logrotate \
                   smart-gui laptop-mode-tools mambatray \
                   $(MAKEDIST_TARGET)-livecd-gnome
 

platforms/livecd-light-root/Makefile

@@ -2,7 +2,7 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted i
              ppp minicom locales mc alsa-utils \
              man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
              openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
-             lxde timezone sudo \
+             lxde timezone sudo vixie-cron logrotate \
              openobex liblame expect prelink NetworkManager ModemManager \
              network-manager-applet Mesa-tools \
              x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \
@@ -21,7 +21,7 @@ $(MAKEDIST_TARGET)-livecd-light-root: \
                   chromium totem-mozilla-plugin \
                   livecd-tools \
                   Mesa-tools driconf parted testdisk \
-                  samba-server \
+                  samba-server vixie-cron logrotate \
                   smart-gui cpufreqd mambatray \
                   $(MAKEDIST_TARGET)-livecd-light
 

platforms/livecd-root/Makefile

@@ -10,7 +10,7 @@ $(MAKEDIST_TARGET)-livecd-root: \
                   xorg-drv-input-synaptics xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   gparted ntfs-3g libdvdcss \
-                  chromium \
+                  chromium vixie-cron logrotate \
                   macbook-tools livecd-tools \
                   Mesa-tools driconf parted testdisk \
                   samba-server \

platforms/livedvd-root/Makefile

@@ -10,7 +10,7 @@ $(MAKEDIST_TARGET)-livedvd-root: \
                   xorg-drv-input-synaptics xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   gparted ntfs-3g libdvdcss \
-                  chromium kpartsplugin \
+                  chromium kpartsplugin vixie-cron logrotate \
                   macbook-tools livecd-tools gdb \
                   Mesa-tools driconf parted testdisk samba-server \
                   smart-gui cpufreqd mambatray \

platforms/livedvd/settings.inc

@@ -10,7 +10,7 @@ if [ "$ARCH" = "i586" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
    KERNEL_EXTRAVER=mamba-x86_64
    KERNEL_PLATFORM=""
-   #KERNEL_ADDITIONAL="vboxvideo"   
+   #KERNEL_ADDITIONAL="vboxvideo"
    KERNEL_MORE_EXTRAVER=
 fi
 
@@ -22,4 +22,5 @@ PRODUCT_NAME_OVERRIDE=livedvd
 TARGET_HOSTNAME=openmamba-livedvd
 ROOTDEV=/dev/sda1
 ROOTFS=ext3
+# Leave empty definition
 APPLICATION_TARGET=

platforms/rootfs-light/Makefile

@@ -1,11 +1,4 @@
 $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \
-             kernel-iconia kernel-iconia-modules \
-             kernel-hannspad kernel-hannspad-modules \
-             kernel-rpi kernel-rpi-modules \
-             kernel-cubox kernel-cubox-modules \
-             kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless \
-             kernel-mamba-arm-dove kernel-mamba-arm-dove-sound kernel-mamba-arm-dove-wireless \
-             kernel-sunxi kernel-sunxi-modules u-boot-sunxi-Bananapi \
              brcm_patchram midori u-boot-tools
 
 $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \
@@ -20,7 +13,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
              parted iputils file rootfiles ppp minicom locales mc \
              man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
              openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
-             timezone sudo kmod \
+             timezone sudo kmod vixie-cron logrotate rsync postfix \
              liblame expect prelink NetworkManager ModemManager NetworkManager-openvpn \
              procps xorg-server x11vnc xkeyboard-config \
              xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \

platforms/rootfs/Makefile

@@ -20,7 +20,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
              parted iputils file rootfiles ppp minicom locales mc \
              man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \
              openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
-             timezone sudo kmod \
+             timezone sudo kmod vixie-cron logrotate rsync postfix \
              liblame expect prelink NetworkManager ModemManager procps \
              xorg-server x11vnc xkeyboard-config screen \
              xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \