From 1828e658a01e8d6eb67499ca1789e4eda1643afb Mon Sep 17 00:00:00 2001 From: Holger Paradies Date: Tue, 12 May 2020 19:43:24 +0200 Subject: Rework ndiswrapper install optional use build-option for ndiswrapper since buster --- config/lists/base | 5 +++++ config/lists/kanotix-eeepc4G | 5 +++++ config/lists/ndiswrapper | 2 ++ nightly_build.bash | 10 +++++----- 4 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 config/lists/ndiswrapper diff --git a/config/lists/base b/config/lists/base index 334be13..d42464b 100644 --- a/config/lists/base +++ b/config/lists/base @@ -226,8 +226,13 @@ btrfs-progs #endif # firmware +#if DISTRIBUTION wheezy jessie ndiswrapper-utils-1.9 ndiswrapper-dkms +#endif +#if DISTRIBUTION stretch +#include +#endif # other hardware bluez diff --git a/config/lists/kanotix-eeepc4G b/config/lists/kanotix-eeepc4G index 6e1018a..e203bc6 100644 --- a/config/lists/kanotix-eeepc4G +++ b/config/lists/kanotix-eeepc4G @@ -193,8 +193,13 @@ btrfs-progs #endif # firmware +#if DISTRIBUTION wheezy jessie ndiswrapper-utils-1.9 ndiswrapper-dkms +#endif +#if DISTRIBUTION stretch +#include +#endif # other hardware blueman diff --git a/config/lists/ndiswrapper b/config/lists/ndiswrapper new file mode 100644 index 0000000..a149890 --- /dev/null +++ b/config/lists/ndiswrapper @@ -0,0 +1,2 @@ +ndiswrapper +ndiswrapper-dkms diff --git a/nightly_build.bash b/nightly_build.bash index 7609a04..f3857a0 100755 --- a/nightly_build.bash +++ b/nightly_build.bash @@ -87,7 +87,7 @@ fi # end of lxde extra # # lxde 64 lb clean -lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging skypeforlinux" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd +lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging skypeforlinux ndiswrapper" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd echo Kanotix silverfire-nightly Silverfire64 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso; mv kanotix64.iso $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.iso; cd .. cp tmpfs/binary.packages $target/kanotix64-silverfire-nightly-${d}${v}-LXDE.packages @@ -109,7 +109,7 @@ fi # # lxde 32 lb clean -lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-lxde-master firefox wine-staging ndiswrapper" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix silverfire-nightly Silverfire32 $d$v LXDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso; mv kanotix32.iso $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.iso; cd .. cp tmpfs/binary.packages $target/kanotix32-silverfire-nightly-${d}${v}-LXDE.packages @@ -131,7 +131,7 @@ fi # # kde 64 lb clean -lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging skypeforlinux" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd +lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging skypeforlinux ndiswrapper" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a amd64 --initsystem systemd echo Kanotix silverfire-nightly Silverfire64 $d$v KDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix64.iso; mv kanotix64.iso $target/kanotix64-silverfire-nightly-${d}${v}-KDE.iso; cd .. cp tmpfs/binary.packages $target/kanotix64-silverfire-nightly-${d}${v}-KDE.packages @@ -153,7 +153,7 @@ fi # # kde 32 lb clean -lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-kde-master firefox wine-staging ndiswrapper" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix silverfire-nightly Silverfire32 $d$v KDE > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso; mv kanotix32.iso $target/kanotix32-silverfire-nightly-${d}${v}-KDE.iso; cd .. cp tmpfs/binary.packages $target/kanotix32-silverfire-nightly-${d}${v}-KDE.packages @@ -175,7 +175,7 @@ fi # # eeepc4G with LXDE lb clean -lb config -d $DISTRO -p "kanotix-eeepc4G midori" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd +lb config -d $DISTRO -p "kanotix-eeepc4G midori ndiswrapper" --bootloader grub2 --tmpfs true --tmpfs-options size=14G --apt-http-proxy "http://127.0.0.1:3142" --cache-packages false --gfxoverlays false -a i386 --initsystem systemd echo Kanotix silverfire-nightly Silverfire32 $d$v eeepc4G > config/chroot_local-includes/etc/kanotix-version lb build; cd tmpfs; ./isohybrid-acritox kanotix32.iso; mv kanotix32.iso $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.iso; cd .. cp tmpfs/binary.packages $target/kanotix32-silverfire-nightly-${d}${v}-eeepc4G.packages -- cgit v1.0