openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various updates for latest media builds

Browse Source
This commit is contained in:
Silvan Calarco 2021-05-13 11:10:25 +02:00
parent 8924262d51
commit 7f4f177389
6 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.defs
View File

@ -621,6 +621,7 @@ ocaml[Simplif] = ocaml-runtime
ocaml[Simplify_boxed_integer_ops] = ocaml-runtime ocaml[Simplify_boxed_integer_ops] = ocaml-runtime
ocaml[Simplify_common] = ocaml-runtime ocaml[Simplify_common] = ocaml-runtime
ocaml[Simplify_primitives] = ocaml-runtime ocaml[Simplify_primitives] = ocaml-runtime
ocaml[Spacetime_profiling] = ocaml-runtime
ocaml[Spill] = ocaml-runtime ocaml[Spill] = ocaml-runtime
ocaml[Split] = ocaml-runtime ocaml[Split] = ocaml-runtime
ocaml[Static_exception] = ocaml-runtime ocaml[Static_exception] = ocaml-runtime
@ -714,6 +715,8 @@ ocaml[Variable] = ocaml-runtime
ocaml[Warnings] = ocaml-runtime ocaml[Warnings] = ocaml-runtime
ocaml[X86_dsl] = ocaml-runtime ocaml[X86_dsl] = ocaml-runtime
ocaml[X86_gas] = ocaml-runtime ocaml[X86_gas] = ocaml-runtime
ocaml[X86_masm] = ocaml-runtime
ocaml[X86_proc] = ocaml-runtime
# perl # perl
perl[B] = perl perl[B] = perl

10
makedist.inc.sh
View File

@ -10,10 +10,10 @@
#create_livecd #create_livecd
initialize_root_dir initialize_root_dir
create_rpm_database create_rpm_database
create_devices #create_devices
echo "Installing preparation packages..." 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" libacl libcap libaudit libselinux libsepol libpcre libcap-ng libattr libstdc++6 libpam" "--nodeps --noorder --noscripts"
# pam initscripts # pam initscripts
chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20 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/ cp -a --no-preserve=ownership $TARGETDIR/platforms/$PLATFORM/root-$LANGUAGE/* $MOUNTDIR/
fi fi
# enable additional smart repositories # enable additional repositories
if [ "$SMART_CHANNELS_ENABLE" != "" ]; then if [ "$SMART_CHANNELS_ENABLE" != "" ]; then
for r in $SMART_CHANNELS_ENABLE; do for r in $SMART_CHANNELS_ENABLE; do
chroot $MOUNTDIR dnf config-manager --enable $r chroot $MOUNTDIR dnf config-manager --enable $r
@ -226,6 +226,10 @@ if [ ! "$KERNEL_IGNORE" ]; then
done done
fi fi
# perform a system upgrade
#dnf update -y
#dnf clean
# rpm database # rpm database
post_install_rpms post_install_rpms
clean_rpm_database clean_rpm_database

10
platforms/livecd-light-root/Makefile
View File

@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted i
network-manager-applet Mesa-tools \ network-manager-applet Mesa-tools \
x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \ x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \
xorg-drv-input-mouse xorg-drv-input-void \ 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 $(MAKEDIST_TARGET)-livecd-light-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
@ -27,8 +27,8 @@ $(MAKEDIST_TARGET)-livecd-light-root: \
$(MAKEDIST_TARGET)-livecd-light $(MAKEDIST_TARGET)-livecd-light
# Localization targets # 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-en: langpacks-en_GB
$(MAKEDIST_TARGET)-livecd-light-root-es: langpacks-es $(MAKEDIST_TARGET)-livecd-light-root-es: langpacks-es firefox-langpack-es
$(MAKEDIST_TARGET)-livecd-light-root-fr: langpacks-fr $(MAKEDIST_TARGET)-livecd-light-root-fr: langpacks-fr firefox-langpack-fr
$(MAKEDIST_TARGET)-livecd-light-root-it: langpacks-it $(MAKEDIST_TARGET)-livecd-light-root-it: langpacks-it firefox-langpack-it

10
platforms/livecd-root/Makefile
View File

@ -11,7 +11,7 @@ $(MAKEDIST_TARGET)-livecd-root: \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
partitionmanager ntfs-3g libdvdcss \ partitionmanager ntfs-3g libdvdcss \
NetworkManager ModemManager \ NetworkManager ModemManager \
chromium vixie-cron logrotate \ firefox vixie-cron logrotate \
livecd-tools \ livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server sddm \ samba-server sddm \
@ -19,8 +19,8 @@ $(MAKEDIST_TARGET)-livecd-root: \
$(MAKEDIST_TARGET)-livecd-kde $(MAKEDIST_TARGET)-livecd-kde
# Localization targets # 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-en: langpacks-en_GB
$(MAKEDIST_TARGET)-livecd-root-es: langpacks-es $(MAKEDIST_TARGET)-livecd-root-es: langpacks-es firefox-langpack-es
$(MAKEDIST_TARGET)-livecd-root-fr: langpacks-fr $(MAKEDIST_TARGET)-livecd-root-fr: langpacks-fr firefox-langpack-fr
$(MAKEDIST_TARGET)-livecd-root-it: langpacks-it $(MAKEDIST_TARGET)-livecd-root-it: langpacks-it firefox-langpack-it

10
platforms/livedvd-root/Makefile
View File

@ -10,17 +10,17 @@ $(MAKEDIST_TARGET)-livedvd-root: \
xorg-drv-input-synaptics xorg-apps-extra xterm \ xorg-drv-input-synaptics xorg-apps-extra xterm \
ttf-freefont liberation-fonts-ttf \ ttf-freefont liberation-fonts-ttf \
partitionmanager ntfs-3g libdvdcss \ partitionmanager ntfs-3g libdvdcss \
chromium kpartsplugin vixie-cron logrotate \ firefox kpartsplugin vixie-cron logrotate \
macbook-tools livecd-tools gdb \ macbook-tools livecd-tools gdb \
Mesa-tools driconf parted testdisk samba-server \ Mesa-tools driconf parted testdisk samba-server \
mambatray sddm \ mambatray sddm \
$(MAKEDIST_TARGET)-livedvd-kde testdisk photorec $(MAKEDIST_TARGET)-livedvd-kde testdisk photorec
# Localization targets # 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-en: langpacks-en_GB
$(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es $(MAKEDIST_TARGET)-livedvd-root-es: langpacks-es firefox-langpack-es
$(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr $(MAKEDIST_TARGET)-livedvd-root-fr: langpacks-fr firefox-langpack-fr
$(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it $(MAKEDIST_TARGET)-livedvd-root-it: langpacks-it firefox-langpack-it
# FIXME: add kdepim # FIXME: add kdepim
syslog-ng: syslog-ng:
@echo @echo

8
platforms/rootfs-light/Makefile
View File

@ -24,8 +24,8 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd
# Localization targets # 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)-en: langpacks-en_GB
$(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es $(MAKEDIST_TARGET)-$(PLATFORM)-es: langpacks-es firefox-langpacks-es
$(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr $(MAKEDIST_TARGET)-$(PLATFORM)-fr: langpacks-fr firefox-langpacks-fr
$(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it $(MAKEDIST_TARGET)-$(PLATFORM)-it: langpacks-it firefox-langpacks-it