Changes following release change from "devel" to "rolling"

This commit is contained in:
Silvan Calarco 2023-08-08 10:03:10 +02:00
parent e5292f949d
commit 3dcf27191f
6 changed files with 8 additions and 8 deletions

View File

@ -1,6 +1,6 @@
$(MAKEDIST_TARGET): rpm make $(MAKEDIST_TARGET): rpm make
# gcc gcc-c++ gcc-cpp # gcc gcc-c++ gcc-cpp
$(MAKEDIST_TARGET)-devel: $(MAKEDIST_TARGET)-rolling:
$(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline glibc \ $(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline glibc \
ncurses systemd setup coreutils rootfiles chkconfig \ 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 \ ntfs-3g fuse-exfat reiserfsprogs ppp b43-tools mdadm usb-modeswitch \
usbutils ftp eject bluez lsof rsync \ usbutils ftp eject bluez lsof rsync \
pcmcia-utils xdg-utils iproute $(MAKEDIST_TARGET)-firmwares \ 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 \ $(MAKEDIST_TARGET)-debug: strace valgrind gdb minicom openssh-server dhcpclient rpm iputils \
openssh-clients diffutils Mesa-tools kbd mc openmamba-release openssh-clients diffutils Mesa-tools kbd mc openmamba-release
#bootchart #bootchart

View File

@ -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 if [ "$MODE" = "rootfsinstall" ]; then
DISKIMG_FILE="$LOCALSTATEDIR/${BASE_IMAGE}${RELEASE_ADD}-$LANGUAGE.$DEVICEARCH.tar.xz" DISKIMG_FILE="$LOCALSTATEDIR/${BASE_IMAGE}${RELEASE_ADD}-$LANGUAGE.$DEVICEARCH.tar.xz"
echo "Using image $DISKIMG_FILE..." echo "Using image $DISKIMG_FILE..."

View File

@ -4,7 +4,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-i586:
$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64:
$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-rolling \
bash rpm smart bash rpm smart
# Localization targets # Localization targets

View File

@ -10,7 +10,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \
$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \ $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \
kernel-mamba-x86_64 firefox sddm 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 \ lxqt-session openbox lxqt-archiver lximage-qt blueman \
openssh-server usbutils wireless_tools screen \ openssh-server usbutils wireless_tools screen \
parted iputils file rootfiles ppp minicom locales mc \ parted iputils file rootfiles ppp minicom locales mc \

View File

@ -15,7 +15,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \
kernel-mamba-x86_64 \ kernel-mamba-x86_64 \
firefox linux-firmware sddm 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 \ $(MAKEDIST_TARGET)-$(PLATFORM)-kde openssh-server usbutils wireless_tools \
parted iputils file rootfiles ppp minicom locales mc \ parted iputils file rootfiles ppp minicom locales mc \
man-db curl zip unzip iptables iproute wpa_supplicant nfs-utils \ man-db curl zip unzip iptables iproute wpa_supplicant nfs-utils \
@ -29,7 +29,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
# startactive # startactive
# tightvnc-server lxde network-manager-applet matchbox-keyboard midori Mesa-tools alsa-utils # tightvnc-server lxde network-manager-applet matchbox-keyboard midori Mesa-tools alsa-utils
# embedded-devel embedded-debug \ # embedded-rolling embedded-debug \
#mkfontscale vsftpd #mkfontscale vsftpd
#webmin #webmin
# FIXME: expext is a webmin prereq # FIXME: expext is a webmin prereq

View File

@ -1,4 +1,4 @@
RELEASE=devel RELEASE=rolling
MAKEFILE_TARGET=${MAKEDIST_TARGET} MAKEFILE_TARGET=${MAKEDIST_TARGET}
KERNEL_ADDITIONAL="sound" KERNEL_ADDITIONAL="sound"