diff --git a/list-common.sh b/list-common.sh index 3f7023b..d654dcf 100644 --- a/list-common.sh +++ b/list-common.sh @@ -1,9 +1,7 @@ -buildignore gutenprint buildignore poppler-data buildignore tin buildignore desktop-translations buildignore ft2demos -buildignore hplip-hpijs buildignore libreoffice-base buildignore libreoffice-mailmerge buildignore libreoffice-math @@ -13,7 +11,6 @@ buildignore readline-doc buildignore graphviz buildignore linux-kernel-headers buildignore bash-doc -buildignore hplip buildignore gimp-plugins-python buildignore patterns-openSUSE-gnome_basis_opt buildignore patterns-openSUSE-gnome_admin @@ -50,10 +47,11 @@ buildignore p7zip buildignore busybox-static buildignore inxi -install gfxboot +# Just too big +buildignore sane-backends -install cracklib -install cracklib-dict-full +install branding-openSUSE +install gfxboot # Don't pull in any -32bit libs buildignore glibc-32bit @@ -80,9 +78,7 @@ buildignore irda buildignore lomoco buildignore mksh -buildignore system-config-printer-applet -buildignore udev-configure-printer - +# Legacy packages - not actually used, but pull in quite a lot buildignore xorg-x11 buildignore xorg-x11-essentials buildignore xorg-x11-server-extra @@ -150,6 +146,11 @@ buildignore ghostscript buildignore ghostscript-fonts-std buildignore ghostscript-fonts-other buildignore manufacturer-PPDs +buildignore gutenprint +buildignore hplip-hpijs +buildignore hplip +buildignore system-config-printer-applet +buildignore udev-configure-printer # We don't need those buildignore yast2-samba-client @@ -172,10 +173,114 @@ buildignore systemd-logger # Can't install this with the latest kernel due to boo#1095148 # And virtualbox is build failed on i586 in TW - 20180617 maxlin -buildignore virtualbox-guest-kmp-default +buildignore virtualbox-guest-tools +buildignore virtualbox-guest-x11 # bsc#1125156 buildignore intel-gpu-tools # For certain features in VMs using the spice protocol install spice-vdagent +# Same for VMware, but unfortunately too big (~15MiB!) +buildignore open-vm-tools + +# Pulls in tcl +buildignore usb_modeswitch + +# This was previously required by rest_cd_core +install kernel-default +install kernel-firmware +install patterns-base-enhanced_base +installPattern enhanced_base +install patterns-base-x11 +installPattern x11 +installPattern sw_management +install yast2-bootloader +install yast2-country +install yast2-hardware-detection +install yast2-network +install yast2-proxy +install yast2-storage-ng + +# This was previously recommended by rest_cd_core +install adaptec-firmware +install atmel-firmware +install b43-fwcutter +install bluez-firmware +install btrfsprogs +install crda +install cryptsetup +install dmidecode +install dosfstools +install e2fsprogs +install efibootmgr +install gtk2-branding-openSUSE +install insserv +install ipw-firmware +install iw +install jfsutils +install libatm1 +install lsb-release +install lvm2 +install memtest86+ +install mpt-firmware +install nano +install ntfs-3g +install open-iscsi +install pcmciautils +install pptp +install quota +install reiserfs +install rsync +install smartmontools +install smbios-utils-python +install util-linux +install wireless-regdb +install wpa_supplicant +install xf86-video-ark +install xf86-video-ast +install xf86-video-ati +install xf86-video-chips +install xf86-video-cirrus +install xf86-video-fbdev +install xf86-video-glint +install xf86-video-i128 +install xf86-video-mach64 +install xf86-video-mga +install xf86-video-neomagic +install xf86-video-nouveau +install xf86-video-nv +install xf86-video-qxl +install xf86-video-r128 +install xf86-video-savage +install xf86-video-siliconmotion +install xf86-video-sis +install xf86-video-sisusb +install xf86-video-tdfx +install xf86-video-tga +install xf86-video-v4l +install xf86-video-vesa +install xf86-video-vmware +install xf86-video-voodoo +install xfsdump +install xfsprogs +install xz +install yast2-trans-cs +install yast2-trans-da +install yast2-trans-de +install yast2-trans-en_GB +install yast2-trans-en_US +install yast2-trans-es +install yast2-trans-fr +install yast2-trans-hu +install yast2-trans-it +install yast2-trans-ja +install yast2-trans-pl +install yast2-trans-pt +install yast2-trans-pt_BR +install yast2-trans-ru +install yast2-trans-sv +install yast2-trans-zh_CN +install yast2-trans-zh_TW +install zd1211-firmware +install zip diff --git a/list-gnome.sh b/list-gnome.sh index 9b8ee84..436b1a5 100644 --- a/list-gnome.sh +++ b/list-gnome.sh @@ -6,9 +6,6 @@ buildignore libreoffice-icon-theme-sifr buildignore libreoffice-icon-theme-hicontrast buildignore colord buildignore apparmor-utils -install patterns-media-rest_cd_gnome -installPattern rest_cd_gnome -install openSUSE-release-livecd-gnome install branding-openSUSE # adobe-sourcecodepro-fonts is the monospace font for openSUSE @@ -29,10 +26,13 @@ buildignore noto-sans-kr-regular-fonts # Expected by openQA install libreoffice-writer +# Packages for the installer install live-net-installer install skelcd-openSUSE # Needed for README.BETA install setxkbmap # Needed by yast2-keyboard install yast2-qt-branding-openSUSE +install cracklib +install cracklib-dict-full # Pulls in sane-backends buildignore simple-scan @@ -68,3 +68,31 @@ install gparted # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD buildignore cyrus-sasl + +# From rest_cd_core +install alsa-firmware + +# Previously required by rest_cd_gnome +installPattern apparmor +installPattern games +installPattern gnome +installPattern gnome_basis +installPattern gnome_imaging +installPattern gnome_internet +installPattern gnome_multimedia +installPattern gnome_office +installPattern gnome_utilities +installPattern gnome_yast +installPattern imaging +installPattern multimedia +installPattern office +installPattern sw_management_gnome +installPattern yast2_basis +installPattern yast2_install_wf + +# Previously recommended by rest_cd_gnome +install gnome-mines +install gnome-shell-browser-plugin +install gnome-sudoku +install quadrapassel +install cifs-utils diff --git a/list-kde.sh b/list-kde.sh index 2fd5b41..030bbe9 100644 --- a/list-kde.sh +++ b/list-kde.sh @@ -3,16 +3,13 @@ buildignore libreoffice-icon-theme-galaxy buildignore libreoffice-icon-theme-hicontrast buildignore libreoffice-icon-theme-tango buildignore libreoffice-base-drivers-mysql +buildignore libreoffice-pyuno buildignore cairomm buildignore evolution-data-server buildignore notification-daemon buildignore gdm -buildignore sane-backends buildignore akregator -buildignore libreoffice-pyuno buildignore ImageMagick -install patterns-media-rest_cd_core -installPattern rest_cd_core install patterns-kde-kde installPattern kde install openSUSE-release-livecd-kde @@ -27,10 +24,15 @@ buildignore libreoffice-icon-theme-breeze buildignore xorg-x11-fonts buildignore kdenetwork4-filesharing buildignore gnome-keyring + +# Packages for the installer install live-net-installer install skelcd-openSUSE # Needed for README.BETA install setxkbmap # Needed by yast2-keyboard install yast2-qt-branding-openSUSE +install cracklib +install cracklib-dict-full + buildignore oxygen5-icon-theme-large buildignore gwenview5 @@ -50,7 +52,6 @@ install kcharselect buildignore patterns-kde-kde_pim buildignore gdb -buildignore open-vm-tools-desktop buildignore icewm buildignore libproxy1-pacrunner-webkit buildignore digikam @@ -59,5 +60,10 @@ buildignore gimp-lang install partitionmanager +install cifs-utils + # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD buildignore cyrus-sasl + +# From rest_cd_core +install alsa-firmware diff --git a/list-x11.sh b/list-x11.sh index 3d8ce16..2c2ccd5 100644 --- a/list-x11.sh +++ b/list-x11.sh @@ -1,10 +1,5 @@ -install branding-openSUSE buildignore PackageKit buildignore samba-libs -install yast2-trans-stats -install patterns-media-rest_cd_x11 -installPattern rest_cd_x11 -install openSUSE-release-livecd-x11 buildignore release-notes-openSUSE buildignore gnome-themes-accessibility buildignore xlockmore @@ -18,13 +13,13 @@ buildignore gtk3-immodule-vietnamese buildignore gtk3-lang buildignore zenity-lang buildignore alsa +buildignore alsa-firmware buildignore alsa-plugins buildignore xscreensaver buildignore PackageKit-gstreamer-plugin buildignore ImageMagick buildignore awesfx buildignore sbl -buildignore open-vm-tools buildignore gnome-online-accounts buildignore xorg-x11-fonts buildignore snapper @@ -50,3 +45,45 @@ install midori # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD buildignore cyrus-sasl + +# Previously required by rest_cd_x11 +install patterns-xfce-xfce_basis +installPattern xfce_basis +install evince +install evince-plugin-pdfdocument +install file-roller +install gparted +install hexchat +install leafpad +install lightdm +install lightdm-gtk-greeter +install photorec +install ristretto +install thunar +install thunar-volman +install xfce4-appfinder +install xfce4-mixer +install xfce4-notifyd +install xfce4-panel +install xfce4-panel-plugin-mixer +install xfce4-power-manager +install xfce4-session +install xfce4-settings +install xfconf +install xfdesktop +install xfwm4 + +# Previously recommended by rest_cd_x11 +install dbus-1-x11 +install desktop-file-utils +install libgnomesu +install libxfce4ui-tools +install libyui-qt-pkg +install pinentry-gtk2 +install shared-mime-info +install xdg-user-dirs-gtk +install xdg-utils +install NetworkManager-applet +install xfce4-panel-plugin-xkb +install xfce4-terminal +install yast2-control-center-qt diff --git a/list-xfce.sh b/list-xfce.sh index f8abe1f..b100b0d 100644 --- a/list-xfce.sh +++ b/list-xfce.sh @@ -1,8 +1,6 @@ install branding-openSUSE buildignore samba-libs install yast2-trans-stats -install patterns-media-rest_cd_core -installPattern rest_cd_core install patterns-xfce-xfce installPattern xfce install openSUSE-release-livecd-xfce @@ -17,15 +15,17 @@ buildignore gtk3-immodule-thai buildignore gtk3-immodule-vietnamese buildignore awesfx buildignore sbl -buildignore open-vm-tools buildignore gnome-online-accounts -buildignore snapper + +# Packages for the installer install live-net-installer install skelcd-openSUSE # Needed for README.BETA install setxkbmap # Needed by yast2-keyboard install yast2-qt-branding-openSUSE +install cracklib +install cracklib-dict-full + buildignore aspell-en -buildignore fprintd install libxslt-tools archive xfce-changecontrolxml.tar.xz @@ -45,3 +45,6 @@ install evince # Ignore xreader for now buildignore xreader + +# From rest_cd_core +install alsa-firmware diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 89e96f6..6f1e760 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -53,8 +53,6 @@ - - @@ -63,8 +61,6 @@ - - @@ -83,8 +79,6 @@ - - @@ -155,9 +149,10 @@ + + + - - @@ -196,10 +191,6 @@ - - - - @@ -275,6 +266,16 @@ + + + + + + + + + + @@ -297,11 +298,111 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -320,9 +421,6 @@ - - - @@ -352,6 +450,8 @@ + + @@ -387,6 +487,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index c62f760..5ad0839 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -53,8 +53,6 @@ - - @@ -63,8 +61,6 @@ - - @@ -83,8 +79,6 @@ - - @@ -155,9 +149,10 @@ + + + - - @@ -196,10 +191,6 @@ - - - - @@ -275,6 +266,16 @@ + + + + + + + + + + @@ -297,11 +298,111 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -314,6 +415,8 @@ + + @@ -322,16 +425,10 @@ - - - - - - @@ -354,6 +451,8 @@ + + @@ -371,8 +470,6 @@ - - @@ -384,8 +481,10 @@ + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 7a6912b..969d974 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -53,8 +53,6 @@ - - @@ -63,8 +61,6 @@ - - @@ -83,8 +79,6 @@ - - @@ -155,9 +149,10 @@ + + + - - @@ -196,10 +191,6 @@ - - - - @@ -275,6 +266,16 @@ + + + + + + + + + + @@ -297,22 +298,117 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - @@ -339,6 +435,8 @@ + + @@ -351,8 +449,6 @@ - - @@ -387,6 +483,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 1acd240..06e6445 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 25 15:59:12 UTC 2019 - Fabian Vogt + +- Replace rest_cd_* patterns with direct package mentions +- Some cleanups +- Don't install cracklib-dict-full on x11 +- Don't ignore snapper on xfce, needed for the installer +- Ignore usb_modeswitch, fprintd, open-vm-tools +- Add pkg_diff.sh to show list of effective package changes + ------------------------------------------------------------------- Mon Mar 25 09:45:17 UTC 2019 - Fabian Vogt diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index d31e3de..1d7608d 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -53,8 +53,6 @@ - - @@ -63,8 +61,6 @@ - - @@ -83,8 +79,6 @@ - - @@ -155,9 +149,10 @@ + + + - - @@ -196,10 +191,6 @@ - - - - @@ -275,6 +266,16 @@ + + + + + + + + + + @@ -297,11 +298,111 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -320,9 +421,6 @@ - - - @@ -352,6 +450,8 @@ + + @@ -387,6 +487,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index 10a263b..20293a3 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -53,8 +53,6 @@ - - @@ -63,8 +61,6 @@ - - @@ -83,8 +79,6 @@ - - @@ -155,9 +149,10 @@ + + + - - @@ -196,10 +191,6 @@ - - - - @@ -275,6 +266,16 @@ + + + + + + + + + + @@ -297,11 +298,111 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -314,6 +415,8 @@ + + @@ -322,16 +425,10 @@ - - - - - - @@ -354,6 +451,8 @@ + + @@ -371,8 +470,6 @@ - - @@ -384,8 +481,10 @@ + + diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 04876ba..1172400 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -53,8 +53,6 @@ - - @@ -63,8 +61,6 @@ - - @@ -83,8 +79,6 @@ - - @@ -155,9 +149,10 @@ + + + - - @@ -196,10 +191,6 @@ - - - - @@ -275,6 +266,16 @@ + + + + + + + + + + @@ -297,22 +298,117 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - @@ -339,6 +435,8 @@ + + @@ -351,8 +449,6 @@ - - @@ -387,6 +483,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 023eb94..d7c9c45 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -53,8 +53,6 @@ - - @@ -63,8 +61,6 @@ - - @@ -83,8 +79,6 @@ - - @@ -155,9 +149,10 @@ + + + - - @@ -196,10 +191,6 @@ - - - - @@ -275,6 +266,16 @@ + + + + + + + + + + @@ -297,19 +298,117 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -335,20 +434,16 @@ - - - - + + - - @@ -363,6 +458,7 @@ + diff --git a/pkg-diff.sh b/pkg-diff.sh new file mode 100644 index 0000000..701c2b4 --- /dev/null +++ b/pkg-diff.sh @@ -0,0 +1,28 @@ +#!/bin/bash +if [ $# -ne 2 ]; then + printf "Show a diff of installed packages in the various flavors.\nUsage: $0 project arch\n" + exit 1 +fi + +project=$1 +arch=$2 + +fetch_pkglist() { + local project=$1 + local package=$2 + local repo=$3 + local arch=$4 + local binaryname=$(osc ls -b ${project} ${package} -a ${arch} | grep .packages | xargs) + + osc api /build/${project}/${repo}/${arch}/${package}/${binaryname} | awk -F\| '{ print $1 }' | sort -u +} + +tmpdir=$(mktemp -d) +trap 'rm -rf ${tmpdir}' EXIT + +for i in {x11,xfce,kde,gnome}; do + fetch_pkglist openSUSE:Factory:Live livecd-tumbleweed-$i images ${arch} > ${tmpdir}/list-old + fetch_pkglist ${project} livecd-tumbleweed-$i openSUSE_Tumbleweed ${arch} > ${tmpdir}/list-new + echo "$i" + diff -u ${tmpdir}/list-{old,new} +done