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

Updates/fix to rootfs* targets and smart -> dnf changes

Browse Source
This commit is contained in:
Silvan Calarco 2019-08-04 16:30:42 +02:00
parent 49871dd73d
commit 68aea4be88
13 changed files with 60 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/livecd-gnome-root/Makefile
View File

@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livecd-gnome: \
ModemManager network-manager-applet Mesa-tools \ ModemManager 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 \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart desktop-base-openmamba \ xorg-drv-input-tslib xcursor-transparent-theme rpm dnf desktop-base-openmamba \
gdm gnome-session gnome-common gnome-control-center gnome-desktop \ gdm gnome-session gnome-common gnome-control-center gnome-desktop \
gnome-keyring gnome-menus gnome-mime-data gnome-packagekit gnome-settings-daemon \ gnome-keyring gnome-menus gnome-mime-data gnome-packagekit gnome-settings-daemon \
gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \ gnome-terminal nautilus gnome-themes evolution gnome-utils gnome-system-log \
@ -27,7 +27,7 @@ $(MAKEDIST_TARGET)-livecd-gnome-root: \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server vixie-cron logrotate \ samba-server vixie-cron logrotate \
smart-gui laptop-mode-tools mambatray \ laptop-mode-tools mambatray \
$(MAKEDIST_TARGET)-livecd-gnome $(MAKEDIST_TARGET)-livecd-gnome
# Localization targets # Localization targets

2
platforms/livecd-gnome-root/post.inc.sh
View File

@ -28,7 +28,7 @@ chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms # remove kernel headers installed by dkms
chroot $MOUNTDIR smart remove kernel-${K}-headers -y chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
done done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img*; do for f in $MOUNTDIR/boot/initramfs-*.img*; do

2
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 \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart chromium desktop-base-openmamba xorg-drv-input-tslib rpm dnf chromium 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

2
platforms/livecd-light-root/post.inc.sh
View File

@ -21,7 +21,7 @@ chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms # remove kernel headers installed by dkms
chroot $MOUNTDIR smart remove kernel-${K}-headers -y chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
done done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img*; do for f in $MOUNTDIR/boot/initramfs-*.img*; do

2
platforms/livecd-root/Makefile
View File

@ -14,7 +14,7 @@ $(MAKEDIST_TARGET)-livecd-root: \
livecd-tools \ livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server sddm \ samba-server sddm \
mambatray smart \ mambatray dnf \
$(MAKEDIST_TARGET)-livecd-kde $(MAKEDIST_TARGET)-livecd-kde
# Localization targets # Localization targets

2
platforms/livecd-root/post.inc.sh
View File

@ -26,7 +26,7 @@ chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms # remove kernel headers installed by dkms
chroot $MOUNTDIR smart remove kernel-${K}-headers -y chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
done done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img*; do for f in $MOUNTDIR/boot/initramfs-*.img*; do

2
platforms/rootfs-base/Makefile
View File

@ -5,7 +5,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)-devel \
bash rpm smart bash rpm dnf
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-$(PLATFORM)-en: $(MAKEDIST_TARGET)-$(PLATFORM)-en:

13
platforms/rootfs-light/Makefile
View File

@ -2,22 +2,21 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \
brcm_patchram midori u-boot-tools brcm_patchram midori u-boot-tools
$(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \
kernel-mamba kernel-mamba-sound kernel-mamba-wireless chromium \ kernel-mamba kernel-mamba-64GB chromium
kernel-mamba-64GB kernel-mamba-64GB-sound kernel-mamba-64GB-wireless
$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \ $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \
kernel-mamba-x86_64 kernel-mamba-x86_64-sound kernel-mamba-x86_64-wireless chromium kernel-mamba-x86_64 chromium
$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
lxde openssh-server usbutils wireless_tools screen i2c-tools \ lxde openssh-server usbutils wireless_tools screen \
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 mtd-utils nfs-utils \ man-db curl zip unzip iptables iproute wpa_supplicant nfs-utils \
openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
timezone sudo kmod vixie-cron logrotate rsync postfix \ timezone sudo kmod vixie-cron logrotate rsync postfix \
liblame expect NetworkManager ModemManager NetworkManager-openvpn \ liblame expect NetworkManager ModemManager NetworkManager-openvpn \
procps xorg-server x11vnc xkeyboard-config \ procps xorg-server x11vnc xkeyboard-config \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ rpm dnf xdg-utils \
dhcp-server rfkill plymouth live-user-environment \ rfkill plymouth live-user-environment \
postplug-xorg postplug-sound gparted tar net-tools mambatray florence postplug-xorg postplug-sound gparted tar net-tools mambatray florence
# startactive # startactive

30
platforms/rootfs-light/post.inc.sh
View File

@ -34,15 +34,15 @@
#chkconfig --del portmap #chkconfig --del portmap
#" #"
# configure touchscreen ## configure touchscreen
cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF #cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF
TSLIB_CONFFILE=/etc/ts.conf #TSLIB_CONFFILE=/etc/ts.conf
TSLIB_CONSOLEDEVICE=none #TSLIB_CONSOLEDEVICE=none
TSLIB_FBDEVICE=/dev/fb0 #TSLIB_FBDEVICE=/dev/fb0
TSLIB_TSDEVICE=/dev/input/event0 #TSLIB_TSDEVICE=/dev/input/event0
TSLIB_CALIBFILE=/etc/pointercal #TSLIB_CALIBFILE=/etc/pointercal
HOME=/root #HOME=/root
_EOF #_EOF
# remove some documentation to save space # remove some documentation to save space
for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do
@ -55,12 +55,12 @@ if [ "$ARCH" = "arm" ]; then
sed -i "s|FS_SWAP_UPDATE=yes|FS_SWAP_UPDATE=no|" $MOUNTDIR/etc/sysconfig/postplug sed -i "s|FS_SWAP_UPDATE=yes|FS_SWAP_UPDATE=no|" $MOUNTDIR/etc/sysconfig/postplug
fi fi
# FIXME: this should be done by postplug only when touchscreen is detected ## FIXME: this should be done by postplug only when touchscreen is detected
mkdir -p $MOUNTDIR/home/liveuser/.icons/default #mkdir -p $MOUNTDIR/home/liveuser/.icons/default
cat > $MOUNTDIR/home/liveuser/.icons/default/index.theme << _EOF #cat > $MOUNTDIR/home/liveuser/.icons/default/index.theme << _EOF
[Icon Theme] #[Icon Theme]
Inherits=xcursor-transparent #Inherits=xcursor-transparent
_EOF #_EOF
# configure default liveuser password # configure default liveuser password
echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin

18
platforms/rootfs/Makefile
View File

@ -1,30 +1,26 @@
$(MAKEDIST_TARGET)-$(PLATFORM)-kde: desktop-base-kde bluedevil5 kwalletmanager spectacle $(MAKEDIST_TARGET)-$(PLATFORM)-kde: desktop-base-kde bluedevil5 kwalletmanager spectacle
$(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \
kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \ kernel-mamba-arm linux-firmware brcm_patchram u-boot-tools
kernel-sgn kernel-sgn-modules \
kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless \
linux-firmware brcm_patchram u-boot-tools
$(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \
kernel-mamba kernel-mamba-sound kernel-mamba-wireless \ kernel-mamba kernel-mamba-64GB \
kernel-mamba-64GB kernel-mamba-64GB-sound kernel-mamba-64GB-wireless \
chromium linux-firmware chromium linux-firmware
$(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \ $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: \
kernel-mamba-x86_64 kernel-mamba-x86_64-sound kernel-mamba-x86_64-wireless \ kernel-mamba-x86_64 \
chromium linux-firmware chromium linux-firmware
$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
$(MAKEDIST_TARGET)-$(PLATFORM)-kde openssh-server usbutils wireless_tools i2c-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 mtd-utils nfs-utils \ man-db curl zip unzip iptables iproute wpa_supplicant nfs-utils \
openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
timezone sudo kmod vixie-cron logrotate rsync postfix \ timezone sudo kmod vixie-cron logrotate rsync postfix \
liblame expect NetworkManager ModemManager procps \ liblame expect NetworkManager ModemManager procps \
xorg-server x11vnc xkeyboard-config screen \ xorg-server x11vnc xkeyboard-config screen \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ rpm dnf xdg-utils \
dhcp-server rfkill plymouth live-user-environment \ rfkill plymouth live-user-environment \
postplug-xorg postplug-sound gparted tar net-tools mambatray kvkbd postplug-xorg postplug-sound gparted tar net-tools mambatray kvkbd
# startactive # startactive

38
platforms/rootfs/post.inc.sh
View File

@ -34,20 +34,20 @@
#chkconfig --del portmap #chkconfig --del portmap
#" #"
# configure touchscreen ## configure touchscreen
cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF #cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF
TSLIB_CONFFILE=/etc/ts.conf #TSLIB_CONFFILE=/etc/ts.conf
TSLIB_CONSOLEDEVICE=none #TSLIB_CONSOLEDEVICE=none
TSLIB_FBDEVICE=/dev/fb0 #TSLIB_FBDEVICE=/dev/fb0
TSLIB_TSDEVICE=/dev/input/event0 #TSLIB_TSDEVICE=/dev/input/event0
TSLIB_CALIBFILE=/etc/pointercal #TSLIB_CALIBFILE=/etc/pointercal
HOME=/root #HOME=/root
_EOF #_EOF
# configure favorites in kde menu ## configure favorites in kde menu
for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/kaffeine.desktop; do #for f in /usr/share/applications/chromium.desktop /opt/kde/share/applications/kaffeine.desktop; do
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f # chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
done #done
# remove some documentation to save space # remove some documentation to save space
for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do
@ -60,12 +60,12 @@ if [ "$ARCH" = "arm" ]; then
sed -i "s|FS_SWAP_UPDATE=yes|FS_SWAP_UPDATE=no|" $MOUNTDIR/etc/sysconfig/postplug sed -i "s|FS_SWAP_UPDATE=yes|FS_SWAP_UPDATE=no|" $MOUNTDIR/etc/sysconfig/postplug
fi fi
# FIXME: this should be done by postplug only when touchscreen is detected ## FIXME: this should be done by postplug only when touchscreen is detected
mkdir -p $MOUNTDIR/home/liveuser/.icons/default #mkdir -p $MOUNTDIR/home/liveuser/.icons/default
cat > $MOUNTDIR/home/liveuser/.icons/default/index.theme << _EOF #cat > $MOUNTDIR/home/liveuser/.icons/default/index.theme << _EOF
[Icon Theme] #[Icon Theme]
Inherits=xcursor-transparent #Inherits=xcursor-transparent
_EOF #_EOF
# configure default liveuser password # configure default liveuser password
echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin echo "openmamba" | chroot $MOUNTDIR passwd liveuser --stdin

1
platforms/testcd-root/Makefile
View File

@ -15,7 +15,6 @@ $(MAKEDIST_TARGET)-testcd-root: \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server mambatray \ samba-server mambatray \
$(MAKEDIST_TARGET)-testcd-kde4 openssh-server $(MAKEDIST_TARGET)-testcd-kde4 openssh-server
# smart-gui
# Localization targets # Localization targets
#$(MAKEDIST_TARGET)-testcd-root-en: \ #$(MAKEDIST_TARGET)-testcd-root-en: \

10
platforms/testcd-root/post.inc.sh
View File

@ -1,10 +1,10 @@
# FIXME: ensure alternatives are correclty set # FIXME: ensure alternatives are correclty set
chroot $MOUNTDIR update-alternatives-set-dri chroot $MOUNTDIR update-alternatives-set-dri
# configure favorites in kde menu ## configure favorites in kde menu
for f in /usr/share/applications/chromium.desktop; do #for f in /usr/share/applications/chromium.desktop; do
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f # chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
done #done
# pre-create video drivers for VirtualBox # pre-create video drivers for VirtualBox
virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
@ -16,7 +16,7 @@ chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms # remove kernel headers installed by dkms
chroot $MOUNTDIR smart remove kernel-${K}-headers -y chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
done done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img* do for f in $MOUNTDIR/boot/initramfs-*.img* do