From 7f4f1773897c97e506f680971cb027b36b55e192 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 13 May 2021 11:10:25 +0200 Subject: [PATCH] Various updates for latest media builds --- Makefile.defs | 3 +++ makedist.inc.sh | 10 +++++++--- platforms/livecd-light-root/Makefile | 10 +++++----- platforms/livecd-root/Makefile | 10 +++++----- platforms/livedvd-root/Makefile | 10 +++++----- platforms/rootfs-light/Makefile | 8 ++++---- 6 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index d86b8b0..42aaec6 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -621,6 +621,7 @@ ocaml[Simplif] = ocaml-runtime ocaml[Simplify_boxed_integer_ops] = ocaml-runtime ocaml[Simplify_common] = ocaml-runtime ocaml[Simplify_primitives] = ocaml-runtime +ocaml[Spacetime_profiling] = ocaml-runtime ocaml[Spill] = ocaml-runtime ocaml[Split] = ocaml-runtime ocaml[Static_exception] = ocaml-runtime @@ -714,6 +715,8 @@ ocaml[Variable] = ocaml-runtime ocaml[Warnings] = ocaml-runtime ocaml[X86_dsl] = ocaml-runtime ocaml[X86_gas] = ocaml-runtime +ocaml[X86_masm] = ocaml-runtime +ocaml[X86_proc] = ocaml-runtime # perl perl[B] = perl diff --git a/makedist.inc.sh b/makedist.inc.sh index db97e59..f2965e8 100644 --- a/makedist.inc.sh +++ b/makedist.inc.sh @@ -10,10 +10,10 @@ #create_livecd initialize_root_dir create_rpm_database -create_devices +#create_devices echo "Installing preparation packages..." -install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses setup coreutils chkconfig \ +install_rpms "filesystem gzip texinfo ldconfig chkconfig bash libreadline glibc libncurses setup coreutils \ libacl libcap libaudit libselinux libsepol libpcre libcap-ng libattr libstdc++6 libpam" "--nodeps --noorder --noscripts" # pam initscripts chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20 @@ -211,7 +211,7 @@ else cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/ fi -# enable additional smart repositories +# enable additional repositories if [ "$SMART_CHANNELS_ENABLE" != "" ]; then for r in $SMART_CHANNELS_ENABLE; do chroot $MOUNTDIR dnf config-manager --enable $r @@ -226,6 +226,10 @@ if [ ! "$KERNEL_IGNORE" ]; then done fi +# perform a system upgrade +#dnf update -y +#dnf clean + # rpm database post_install_rpms clean_rpm_database diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index 6f91f02..62de84a 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted i network-manager-applet Mesa-tools \ x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \ xorg-drv-input-mouse xorg-drv-input-void \ - rpm dnf chromium desktop-base-openmamba + rpm dnf firefox desktop-base-openmamba $(MAKEDIST_TARGET)-livecd-light-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress @@ -27,8 +27,8 @@ $(MAKEDIST_TARGET)-livecd-light-root: \ $(MAKEDIST_TARGET)-livecd-light # Localization targets -$(MAKEDIST_TARGET)-livecd-light-root-de: langpacks-de +$(MAKEDIST_TARGET)-livecd-light-root-de: langpacks-de firefox-langpack-de $(MAKEDIST_TARGET)-livecd-light-root-en: langpacks-en_GB -$(MAKEDIST_TARGET)-livecd-light-root-es: langpacks-es -$(MAKEDIST_TARGET)-livecd-light-root-fr: langpacks-fr -$(MAKEDIST_TARGET)-livecd-light-root-it: langpacks-it +$(MAKEDIST_TARGET)-livecd-light-root-es: langpacks-es firefox-langpack-es +$(MAKEDIST_TARGET)-livecd-light-root-fr: langpacks-fr firefox-langpack-fr +$(MAKEDIST_TARGET)-livecd-light-root-it: langpacks-it firefox-langpack-it diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile index 5aedfce..2e26e29 100644 --- a/platforms/livecd-root/Makefile +++ b/platforms/livecd-root/Makefile @@ -11,7 +11,7 @@ $(MAKEDIST_TARGET)-livecd-root: \ ttf-freefont liberation-fonts-ttf \ partitionmanager ntfs-3g libdvdcss \ NetworkManager ModemManager \ - chromium vixie-cron logrotate \ + firefox vixie-cron logrotate \ livecd-tools \ Mesa-tools driconf parted testdisk \ samba-server sddm \ @@ -19,8 +19,8 @@ $(MAKEDIST_TARGET)-livecd-root: \ $(MAKEDIST_TARGET)-livecd-kde # Localization targets -$(MAKEDIST_TARGET)-livecd-root-de: langpacks-de +$(MAKEDIST_TARGET)-livecd-root-de: langpacks-de firefox-langpack-de $(MAKEDIST_TARGET)-livecd-root-en: langpacks-en_GB -$(MAKEDIST_TARGET)-livecd-root-es: langpacks-es -$(MAKEDIST_TARGET)-livecd-root-fr: langpacks-fr -$(MAKEDIST_TARGET)-livecd-root-it: langpacks-it +$(MAKEDIST_TARGET)-livecd-root-es: langpacks-es firefox-langpack-es +$(MAKEDIST_TARGET)-livecd-root-fr: langpacks-fr firefox-langpack-fr +$(MAKEDIST_TARGET)-livecd-root-it: langpacks-it firefox-langpack-it diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index b9c4a92..a667d1f 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -10,17 +10,17 @@ $(MAKEDIST_TARGET)-livedvd-root: \ xorg-drv-input-synaptics xorg-apps-extra xterm \ ttf-freefont liberation-fonts-ttf \ partitionmanager ntfs-3g libdvdcss \ - chromium kpartsplugin vixie-cron logrotate \ + firefox kpartsplugin vixie-cron logrotate \ macbook-tools livecd-tools gdb \ Mesa-tools driconf parted testdisk samba-server \ mambatray sddm \ $(MAKEDIST_TARGET)-livedvd-kde testdisk photorec # Localization targets -$(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de +$(MAKEDIST_TARGET)-livedvd-root-de: langpacks-de firefox-langpack-de $(MAKEDIST_TARGET)-livedvd-root-en: langpacks-en_GB -$(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es -$(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr -$(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it +$(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es firefox-langpack-es +$(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr firefox-langpack-fr +$(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it firefox-langpack-it # FIXME: add kdepim syslog-ng: @echo diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index 5b0c338..f992ab2 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -24,8 +24,8 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd # Localization targets -$(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de +$(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de firefox-langpacks-de $(MAKEDIST_TARGET)-$(PLATFORM)-en: langpacks-en_GB -$(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es -$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr -$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it +$(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpacks-es +$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr firefox-langpacks-fr +$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it firefox-langpacks-it