Fix conflict
packages jdk-openjdk and jre-openjdk are in conflict
This commit is contained in:
parent
5b444089ca
commit
416ace7439
@ -5,18 +5,18 @@
|
|||||||
PACKAGES=(
|
PACKAGES=(
|
||||||
"linux-lts" "linux-firmware" "base" "base-devel" "syslinux" "vi" "emacs" "vim" "nano"
|
"linux-lts" "linux-firmware" "base" "base-devel" "syslinux" "vi" "emacs" "vim" "nano"
|
||||||
"micro" "neovim" "bash-completion" "btop" "gdu" "neofetch" "git" "curl" "wget" "rsync"
|
"micro" "neovim" "bash-completion" "btop" "gdu" "neofetch" "git" "curl" "wget" "rsync"
|
||||||
"unzip" "zip" "gdb" "jdk-openjdk" "jre-openjdk" "openjdk-doc" "tcpdump" "openssh"
|
"unzip" "zip" "gdb" "jdk-openjdk" "openjdk-doc" "tcpdump" "openssh" "bind" "inetutils"
|
||||||
"bind" "inetutils" "nmap" "firefox" "firefox-i18n-fr" "libreoffice" "libreoffice-fr"
|
"nmap" "firefox" "firefox-i18n-fr" "libreoffice" "libreoffice-fr" "rpcbind" "nfs-utils"
|
||||||
"rpcbind" "nfs-utils" "xfce4" "xfce4-goodies" "yakuake" "gimp" "xorg" "xf86-video-vesa"
|
"xfce4" "xfce4-goodies" "yakuake" "gimp" "xorg" "xf86-video-vesa" "xf86-video-dummy"
|
||||||
"xf86-video-dummy" "ttf-dejavu" "ttf-liberation" "ttf-bitstream-vera" "acpid"
|
"ttf-dejavu" "ttf-liberation" "ttf-bitstream-vera" "acpid" "sdl12-compat" "sdl_ttf"
|
||||||
"sdl12-compat" "sdl_ttf" "sdl_gfx" "sdl_image" "sdl_mixer" "sdl_net" "sdl_sound"
|
"sdl_gfx" "sdl_image" "sdl_mixer" "sdl_net" "sdl_sound" "sdl2_gfx" "sdl2_image"
|
||||||
"sdl2_gfx" "sdl2_image" "sdl2_mixer" "sdl2_net" "sdl2_ttf" "dosfstools" "ntfs-3g" "ntp"
|
"sdl2_mixer" "sdl2_net" "sdl2_ttf" "dosfstools" "ntfs-3g" "ntp" "subversion" "cvs" "git"
|
||||||
"subversion" "cvs" "git" "breezy" "python" "wireshark-qt" "wireshark-cli" "evince"
|
"breezy" "python" "wireshark-qt" "wireshark-cli" "evince" "dbus" "mlocate" "gvfs"
|
||||||
"dbus" "mlocate" "gvfs" "strace" "net-tools" "postfix" "sudo" "gtksourceview3" "mplayer"
|
"strace" "net-tools" "postfix" "sudo" "gtksourceview3" "mplayer" "cronie" "optipng"
|
||||||
"cronie" "optipng" "lib32-glibc" "libvirt" "qt5" "xterm" "graphviz" "vlc" "pulseaudio"
|
"lib32-glibc" "libvirt" "qt5" "xterm" "graphviz" "vlc" "pulseaudio" "pulseaudio-alsa"
|
||||||
"pulseaudio-alsa" "tmux" "sleuthkit" "tk" "tcl" "xterm" "junit" "lightdm" "samba" "bind"
|
"tmux" "sleuthkit" "tk" "tcl" "xterm" "junit" "lightdm" "samba" "bind" "krb5" "tree"
|
||||||
"krb5" "tree" "time" "noto-fonts" "noto-fonts-cjk" "noto-fonts-emoji" "noto-fonts-extra"
|
"time" "noto-fonts" "noto-fonts-cjk" "noto-fonts-emoji" "noto-fonts-extra" "numlockx"
|
||||||
"numlockx" "lightdm-gtk-greeter" "tigervnc"
|
"lightdm-gtk-greeter" "tigervnc"
|
||||||
)
|
)
|
||||||
|
|
||||||
SWAP_SIZE=16G
|
SWAP_SIZE=16G
|
||||||
|
Loading…
Reference in New Issue
Block a user