Makefile, Makefile.defs: deps updates after java-openjdk11 and livedvd

Makefile

@@ -2,7 +2,7 @@ $(MAKEDIST_TARGET): rpm make
 # gcc gcc-c++ gcc-cpp
 $(MAKEDIST_TARGET)-devel:
 
-$(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline libreadline6 glibc \
+$(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline glibc \
     ncurses systemd setup coreutils rootfiles chkconfig \
     udev debianutils openmamba-release dracut
 # splashutils
@@ -14,8 +14,8 @@ $(MAKEDIST_TARGET)-commontools: $(_init_system) util-linux kmod \
     net-tools mc dhcpclient timezone nfs-utils openmamba-lsb-core \
     wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
     dosfstools man mbr iptables cups vim iputils sudo postplug less \
-    reiserfsprogs ppp b43-tools mdadm usb-modeswitch \
+    ntfs-3g fuse-exfat reiserfsprogs ppp b43-tools mdadm usb-modeswitch \
-    usbutils ftp telnet whois eject bluez lsof rsync \
+    usbutils ftp eject bluez lsof rsync \
     pcmcia-utils xdg-utils iproute $(MAKEDIST_TARGET)-firmwares \
     dracut postfix $(MAKEDIST_TARGET)-devel
 $(MAKEDIST_TARGET)-debug: strace valgrind gdb minicom openssh-server dhcpclient rpm iputils \

Makefile.defs

@@ -19,7 +19,7 @@ _initsystem = systemd
 /usr/bin/chfn = util-linux
 /usr/bin/chsh = util-linux
 
-/usr/bin/python3 = python3 python33
+/usr/bin/python3 = python3
 /usr/bin/ruby = ruby
 
 #xorgproprietary = xorg-drv-video-fglrx xorg-drv-video-nvidia
@@ -214,7 +214,7 @@ splashtheme = splash-theme-openmamba
 alsaplayer_output = alsaplayer-output-alsa
 #libscanpci.so = xorg-server
 
-#java-openjdk-runtime = java-openjdk8-runtime
+java-openjdk-runtime = java-openjdk11-runtime
 
 ifeq ($(ARCH),x86_64)
 libOpenCL.so.1[][64bit] = ocl-icd
@@ -223,10 +223,11 @@ libEGL.so.1[][64bit] = libEGL
 libGL.so.1[][64bit] = libGL-Mesa-dri
 libGLU.so.1[][64bit] = libGL-Mesa-dri
 libbluetooth.so.3[][64bit] = libbluetooth
-libgtkpeer.so[][64bit] = libgcj4
+libawt.so[][64bit] = java-openjdk-runtime
-libjvm.so[][64bit] = libgcj4
+libawt_xawt.so[][64bit] = java-openjdk-runtime
+libjvm.so[][64bit] = java-openjdk-runtime
 libjawt.so[][64bit] = java-openjdk-runtime
-libawt.so[][64bit] = libgcj4
+libjawt_xawt.so[][64bit] = java-openjdk-runtime
 libjava.so[][64bit] = java-openjdk-runtime
 libjava_crw_demo.so[][64bit] = java-openjdk-runtime
 libjli.so[][64bit] = java-openjdk-runtime
@@ -299,10 +300,9 @@ libEGL.so.1 = libEGL
 libGL.so.1 = libGL-Mesa-dri
 libGLU.so.1 = libGL-Mesa-dri
 libbluetooth.so.3 = libbluetooth
-libgtkpeer.so = libgcj4
+libjvm.so = java-openjdk-runtime
-libjvm.so = libgcj4
+libjawt.so = java-openjdk-runtime
-libjawt.so = libgcj4
+libawt.so = java-openjdk-runtime
-libawt.so = libgcj4
 libjava.so = java-openjdk-runtime
 libjava_crw_demo.so = java-openjdk-runtime
 libjli.so = java-openjdk-runtime

makedist.inc.sh

@@ -214,7 +214,7 @@ fi
 # enable additional smart repositories
 if [ "$SMART_CHANNELS_ENABLE" != "" ]; then
    for r in $SMART_CHANNELS_ENABLE; do
-      chroot $MOUNTDIR smart channel --enable $r
+      chroot $MOUNTDIR dnf config-manager --enable $r
    done
    echo "$SMART_CHANNELS_ENABLE" > $MOUNTDIR/etc/smart/openmamba-install-enabled-channels
 fi

platforms/livedvd-root/Makefile.defs

@@ -1,2 +1,2 @@
-networkmanagergui = plasma-applet-networkmanagement
+networkmanagergui = plasma-nm
 xorgdrvvideo += xorg-drv-video-vboxvideo

platforms/livegames-root/Makefile.defs

@@ -1 +1 @@
-networkmanagergui = plasma-applet-networkmanagement
+networkmanagergui = plasma-nm

platforms/rootfs-custom/Makefile

@@ -0,0 +1,37 @@
+$(MAKEDIST_TARGET)-$(PLATFORM)-arm:
+
+$(MAKEDIST_TARGET)-$(PLATFORM)-i586:
+
+$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64:
+
+$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
+             bash rpm smart
+
+# Localization targets
+$(MAKEDIST_TARGET)-$(PLATFORM)-en:
+
+$(MAKEDIST_TARGET)-$(PLATFORM)-es:
+
+$(MAKEDIST_TARGET)-$(PLATFORM)-it:
+
+$(MAKEDIST_TARGET)-$(PLATFORM)-baytrail: \
+    openssh-server usbutils wireless_tools screen i2c-tools \
+    parted iputils file rootfiles locales mc \
+    man-db curl zip unzip iptables iproute wpa_supplicant \
+    openssh-clients telnet ftp debianutils diffutils bluez4 traceroute \
+    timezone sudo kmod vixie-cron rsync \
+    liblame expect NetworkManager ModemManager \
+    procps xorg-server rpm smart xdg-utils \
+    rfkill plymouth postplug-xorg postplug-sound tar net-tools \
+    kernel-mamba-x86_64 kernel-mamba-x86_64-headers \
+    chipone_ts grub grub-efi-x86_64 rtl8723bs-firmware rtl8723bs_bt \
+    acpi_tables_patch dosfstools fontconfig ttf-freefont avahi cups \
+    pulseaudio system-base-openmamba alsa-ucm-bytcht-es8316 acpid
+
+# rtl8723bs axpd
+
+$(MAKEDIST_TARGET)-$(PLATFORM)-baytrailvt: $(MAKEDIST_TARGET)-$(PLATFORM)-baytrail \
+    gambas3-gb-image gambas3-gb-draw gambas3-runtime gambas3-gb-net \
+    gambas3-gb-qt gambas3-gb-gui gambas-gb-sdl gambas3-gb-form \
+    socat mplayer bluez4-tools
+#     python-reportlab python-pyjon-reports

platforms/rootfs-custom/Makefile.defs

@@ -0,0 +1,8 @@
+packagekitgui = gnome-packagekit
+firewallgui = gui-ufw
+
+ifeq ($(ARCH),x86_64)
+libbluetooth.so.3[][64bit] = libbluetooth4
+else
+libbluetooth.so.3 = libbluetooth4
+endif

platforms/rootfs-custom/post.inc.sh

@@ -0,0 +1 @@
+rm -f $MOUNTDIR/var/lib/smart/channels/*

platforms/rootfs-custom/root/etc/dhcpd.conf

@@ -0,0 +1,30 @@
+#ddns-update-style ad-hoc;
+ignore client-updates;
+
+subnet 10.99.99.0 netmask 255.255.255.0 {
+# --- default gateway
+#       option routers                  192.168.0.254;
+#       option subnet-mask              255.255.255.0;
+#
+#       option nis-domain               "domain.it";
+#       option domain-name              "domain.it";
+#       option domain-name-servers      192.168.0.254;
+#
+#       option time-offset              -18000; # Eastern Standard Time
+#       option ntp-servers              192.168.0.1;
+#       option netbios-name-servers     192.168.0.1;
+# --- Selects point-to-point node (default is hybrid). Don't change this unless
+# -- you understand Netbios very well
+#       option netbios-node-type 2;
+#
+        range dynamic-bootp 10.99.99.100 10.99.99.199;
+        default-lease-time 21600;
+        max-lease-time 43200;
+#
+#       # we want the nameserver to appear at a fixed address
+#       host ns {
+#               next-server dns.domain.it;
+#               hardware ethernet 01:23:45:67:89:AB;
+#               fixed-address 1.2.3.4;
+#       }
+}

platforms/rootfs-custom/root/etc/sysconfig/dhcpd

@@ -0,0 +1,3 @@
+# Command line options here
+DHCPDIFS="usb0"
+DHCPDARGS=

platforms/rootfs-custom/settings.inc

@@ -0,0 +1,17 @@
+if [ "${VARIANT:0:8}" == "baytrail" ]; then
+   KERNEL_EXTRAVER=mamba-x86_64
+   KERNEL_PLATFORM=""
+   KERNEL_ADDITIONAL="headers"
+   KERNEL_MORE_EXTRAVER=
+else
+   KERNEL_IGNORE=true
+fi
+APPLICATION_TARGET=""
+MEDIA=archive_bz2
+#INSTALL_PACKAGES="bash"
+TARGET_HOSTNAME=openmamba-rootfs-custom
+#rpmextraargs="--noscripts"
+#DEBUG=1
+#DEVEL=1
+KEEP_RPM=1
+#RPM=rpm

platforms/rootfs/Makefile.defs

@@ -21,4 +21,4 @@
 #libphonon.so.4 = libphonon
 #phonon_backend = phonon-backend-gstreamer
 #
-#networkmanagergui = plasma-applet-networkmanagement
+networkmanagergui = plasma-nm

platforms/testcd-root/Makefile.defs

@@ -1,2 +1,2 @@
-networkmanagergui = plasma-applet-networkmanagement
+networkmanagergui = plasma-nm
 xorgdrvvideo += xorg-drv-video-vboxvideo