diff --git a/Makefile b/Makefile index b906040..6364430 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ $(MAKEDIST_TARGET): rpm make # gcc gcc-c++ gcc-cpp -$(MAKEDIST_TARGET)-devel: +$(MAKEDIST_TARGET)-rolling: $(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline glibc \ ncurses systemd setup coreutils rootfiles chkconfig \ @@ -17,7 +17,7 @@ $(MAKEDIST_TARGET)-commontools: $(_init_system) util-linux kmod \ ntfs-3g fuse-exfat reiserfsprogs ppp b43-tools mdadm usb-modeswitch \ usbutils ftp eject bluez lsof rsync \ pcmcia-utils xdg-utils iproute $(MAKEDIST_TARGET)-firmwares \ - dracut postfix $(MAKEDIST_TARGET)-devel + dracut postfix $(MAKEDIST_TARGET)-rolling $(MAKEDIST_TARGET)-debug: strace valgrind gdb minicom openssh-server dhcpclient rpm iputils \ openssh-clients diffutils Mesa-tools kbd mc openmamba-release #bootchart diff --git a/platforms/diskimg/post.inc.sh b/platforms/diskimg/post.inc.sh index 28495cb..2b4bf9c 100644 --- a/platforms/diskimg/post.inc.sh +++ b/platforms/diskimg/post.inc.sh @@ -1,4 +1,4 @@ -[ "$RELEASE" -a "$RELEASE" != "devel" ] && RELEASE_ADD="-$RELEASE" || RELEASE_ADD= +[ "$RELEASE" -a "$RELEASE" != "rolling" ] && RELEASE_ADD="-$RELEASE" || RELEASE_ADD= if [ "$MODE" = "rootfsinstall" ]; then DISKIMG_FILE="$LOCALSTATEDIR/${BASE_IMAGE}${RELEASE_ADD}-$LANGUAGE.$DEVICEARCH.tar.xz" echo "Using image $DISKIMG_FILE..." diff --git a/platforms/rootfs-custom/Makefile b/platforms/rootfs-custom/Makefile index 12f8358..7e34245 100644 --- a/platforms/rootfs-custom/Makefile +++ b/platforms/rootfs-custom/Makefile @@ -4,7 +4,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: -$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ +$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-rolling \ bash rpm smart # Localization targets diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index 3f6d0be..7ccab40 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -10,7 +10,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \ kernel-mamba-x86_64 firefox sddm -$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ +$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-rootfs \ lxqt-session openbox lxqt-archiver lximage-qt blueman \ openssh-server usbutils wireless_tools screen \ parted iputils file rootfiles ppp minicom locales mc \ diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index 6628987..a0995ef 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -15,7 +15,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \ kernel-mamba-x86_64 \ firefox linux-firmware sddm -$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ +$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-rolling \ $(MAKEDIST_TARGET)-$(PLATFORM)-kde openssh-server usbutils wireless_tools \ parted iputils file rootfiles ppp minicom locales mc \ man-db curl zip unzip iptables iproute wpa_supplicant nfs-utils \ @@ -29,7 +29,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ # startactive # tightvnc-server lxde network-manager-applet matchbox-keyboard midori Mesa-tools alsa-utils -# embedded-devel embedded-debug \ +# embedded-rolling embedded-debug \ #mkfontscale vsftpd #webmin # FIXME: expext is a webmin prereq diff --git a/settings.inc b/settings.inc index b56df76..12d82ad 100644 --- a/settings.inc +++ b/settings.inc @@ -1,4 +1,4 @@ -RELEASE=devel +RELEASE=rolling MAKEFILE_TARGET=${MAKEDIST_TARGET} KERNEL_ADDITIONAL="sound"