Commit Graph

503 Commits (master)
 

Author SHA1 Message Date
Arnaud Rebillout 7d666c4f78
Add a function require_package to factorize code 4 weeks ago
Arnaud Rebillout 1834c9fcb0
Bump live-build requirement 4 weeks ago
Arnaud Rebillout 3499b2f3fb
Add eatmydata to offline.downloads
This should fix:

    in-target: E: Unable to locate package eatmydata
    eatmydata-udeb/eatmydata-install: error: unable to find /usr/bin/eatmydata after installing the eatmydata package

Cf. 31fb818dec
2 months ago
Arnaud Rebillout 50779f66db
Add espeakup to the list of offline packages
At the moment it's missing, leading to:

    finish-install: info: Running /usr/lib/finish-install.d/06espeakup
    [...]
    in-target: E: Unable to locate package espeakup
2 months ago
Arnaud Rebillout cdca823618
Add console-data for the live image
- https://bugs.kali.org/view.php?id=8741
- https://bugs.debian.org/1070679
2 months ago
Arszilla e4b6f567aa
Update .gitignore because wget-log was not included 4 months ago
Arnaud Rebillout 81bd738d0c Merge branch 'master' into 'master'
Add missing files to .gitignore

See merge request kalilinux/build-scripts/live-build-config!38
4 months ago
Arszilla 08ae4d4b9f
Add missing files to .gitignore 4 months ago
g0t mi1k 5faa0da23a Merge branch 'quote-args-in-debug-logs' into 'master'
Quote arguments where needs be, in debug logs

See merge request kalilinux/build-scripts/live-build-config!37
5 months ago
Arnaud Rebillout 56873621bd
Quote arguments where needs be, in debug logs
Before, looks like that:

    RUNNING: build-simple-cdd --verbose --debug --force-root
    --conf simple-cdd.conf --dist kali-rolling
    --debian-mirror http://kali.download/kali/
    --profiles kali offline
    --auto-profiles kali offline

After, looks like that:

    RUNNING: build-simple-cdd --verbose --debug --force-root
    --conf simple-cdd.conf --dist kali-rolling
    --debian-mirror http://kali.download/kali/
    --profiles 'kali offline'
    --auto-profiles 'kali offline'
5 months ago
Arnaud Rebillout 56fb4a09c3 Merge branch 'misc' into 'master'
Miscellaneous consistencies

See merge request kalilinux/build-scripts/live-build-config!36
5 months ago
Arnaud Rebillout 84891983b0 Merge branch 'kali.download' into 'master'
Simple-CDD: Switch to kali.download as default mirror

See merge request kalilinux/build-scripts/live-build-config!34
5 months ago
Ben Wilson ae9b552efd
Misc formatting 5 months ago
Ben Wilson 0a814e13a7
Simple-CDD: consistency with other settings 5 months ago
Ben Wilson 42f2e223d8
Simple-CDD: fix typo 5 months ago
Ben Wilson fc25ab4848
Simple-CDD: Switch to kali.download as default mirror 5 months ago
Daniel Ruiz de Alegría 474fa5f39a
Fix optimized png boot background not working 6 months ago
Daniel Ruiz de Alegría 3118f95975
Last tweaks to boot menu background 6 months ago
Arnaud Rebillout 96a7dee687
Bump live-build requirement
With this version, arm firmware are excluded from x86 isos, and the
other way round. In practice, it means that raspi-firmware won't be
installed on amd64 isos, and that's something we need.
7 months ago
Daniel Ruiz de Alegría 196e624229
Add bottom black gradient to boot background 7 months ago
Daniel Ruiz de Alegría cb86d249bf
Resize boot image 7 months ago
Daniel Ruiz de Alegría 651911def5
Optimize boot menu background 7 months ago
Daniel Ruiz de Alegría f8f9eac7da
Update boot menu background 7 months ago
Arnaud Rebillout 1d44fe09cf Merge branch 'master' into 'master'
Remove the deprecated copy to /usr/bin/

See merge request kalilinux/build-scripts/live-build-config!31
8 months ago
Arszilla ba88f8c900
Remove the deprecated copy to /usr/bin/ 8 months ago
Arnaud Rebillout 00a213b179
Depend on Kali's fork of debian-cd, and disable DEP11 support
More details can be found at:
* https://gitlab.com/kalilinux/internal/roles/packager/-/issues/30
* https://salsa.debian.org/images-team/debian-cd/-/merge_requests/31
10 months ago
Arnaud Rebillout 972cedebd2
Minor edits to i3 variant
No need to explicitly list kali-themes in the packages to install, it's
pulled in anyway via the following dependency chain: kali-desktop-i3 ->
kali-desktop-core -> kali-themes

I removed the pulseaudio hook. I really don't see a reason to start
pulseaudio once, during the build process, as root. Plus, the second
line of the hook (rm -rf .pulse-cookieaa) has no effect, since there's
no file named .pulse-cookieaa. I added some debug logs to the hook to
confirm that.
1 year ago
Arnaud Rebillout 4957381ac2 Merge branch 'master' into 'master'
Rename variant-i3wm to variant-i3 and enable i3-dotfiles

See merge request kalilinux/build-scripts/live-build-config!30
1 year ago
Arszilla 138dc4bed8 Rename variant-i3wm to variant-i3 and enable i3-dotfiles 1 year ago
Arnaud Rebillout 41a8565ff5
Drop misc package from offline.downloads
These packages were added at a time when debian-cd didn't resolve
Recommends to the end, so we needed to list it explicitly there. But
it's been fixed now, in debian-cd 3.1.36 (cf. #601203), so we can drop
those lines.
1 year ago
Arnaud Rebillout 7e8fc6d6b3
Bump debian-cd requirement to 3.1.36
This is in preparation for next commit
1 year ago
Arnaud Rebillout a1c636e7a6
Drop usr-is-merged from offline.downloads and installer-netinst
usr-is-merged is included in simple-cdd offline.downloads's since
version 0.6.9. Not sure why I needed to list it in installer-netinst as
well at the time, but after testing, I can confirm it's not needed
anymore.
1 year ago
Arnaud Rebillout c8531ad33c
Drop python3-unicodedata2 from offline.downloads
As python 3.11 is now in Kali (rolling and last release)
1 year ago
Arnaud Rebillout 59023ecfce
Bump simple-cdd requirement to 0.6.9
Just so that it's a Debian version, it looks neater.
1 year ago
Arnaud Rebillout 17f0a70d80
Install kali-linux-firmware in Live images
It used to be pulled in as a dependency of kali-linux-headless, but it
just changed, now we must install it manually.
1 year ago
Arnaud Rebillout 828222a5b1
Make sure to include kali-linux-firmware in the installer images
Usually it's pulled in via dependency (as it's a dep of
kali-linux-headless IIRC itself a dep of kali-linux-default). But that's
not the case for Kali Purple, as it doesn't depend on
kali-linux-default.

Furthermore, kali-linux-firmware is now installed in all cases by
tasksel, so we must make sure it's there, instead of relying on
metapackage's dependencies.

Hopefully it will fix:
- https://gitlab.com/kalilinux/kali-purple/documentation/-/issues/8
- https://gitlab.com/kalilinux/kali-purple/documentation/-/issues/11
1 year ago
Arnaud Rebillout fa983c5966
Revert "Make sure to include kali-linux-firmare"
This reverts commit 7bb52e4991.

I wanted to make sure firmware are included in the installer image, but
I missed it, I modified a config file that is only for live images, it
seems...

Also, note that the previous commit message

  Kali purple: install kali-system-gui (instead of core)

Should have been:

  Kali purple: include kali-system-gui (instead of core) in the installer

Because this commit is really about having the package available in the
installer, but it doesn't "install it" on the system. Sorry for the
confusion.
1 year ago
Arnaud Rebillout af49e4d25a
Kali purple: install kali-system-gui (instead of core)
The dep chain is kali-system-gui > kali-system-cli > kali-system-core.

kali-system-cli contains wget and curl, which we probably want to have,
and will fix https://gitlab.com/kalilinux/kali-purple/documentation/-/issues/9

I'm not sure about kali-system-gui, but I have the impression that it
was the intention to install it in Kali Purple, but at some point it was
forgotten and we install kali-system-core instead.
1 year ago
Arnaud Rebillout 7bb52e4991
Make sure to include kali-linux-firmare
As it's now installed in all cases by tasksel, so we must make sure it's
there. This should fix:

- https://gitlab.com/kalilinux/kali-purple/documentation/-/issues/8
- https://gitlab.com/kalilinux/kali-purple/documentation/-/issues/11
1 year ago
Arnaud Rebillout 4561884cbe
Make Kali Purple installer offline
The package exploitdb-papers was removed from kali-tools-identify in
src:kali-meta 2023.1.11, so there's no need to exclude it here anymore.

As a consequence, no need for the network during installation anymore.
1 year ago
Ben Wilson 9502b5ff80
Match ordering 1 year ago
Arnaud Rebillout 37c1a23677
Bump live-build requirement (one more time) 1 year ago
Arnaud Rebillout 384f071f0a
Fix deb822 sources 1 year ago
Raphaël Hertzog e521a18dcf
Enable non-free-firmware by default everywhere
Even though it's currently empty, we want users to have this component
enabled so that they don't miss on updates when we start to move
packages from non-free to non-free-firmware.
1 year ago
Arnaud Rebillout cb8bd8b1c3
Bump live-build requirement (again)
Was missing the epoch, so it didn't trigger
1 year ago
Arnaud Rebillout a364ca4abf
Update kali-purple.postinst to use deb822 sources format 1 year ago
Arnaud Rebillout 243700c73f
Enable Kali Purple installer theme
Other things that I tried, but that didn't work, below:

I tried adding the preseed to simple-cdd/profiles/kali-purple.preseed,
however that didn't work, I guess that this preseed file is loaded only
later during installation, and that at this point the GUI was already
loaded and it's too late to set the theme.

I also tried to do this in simple-cdd.conf:

  # Theming
  if echo " $profiles " | grep -q " kali-purple "; then
    export KERNEL_PARAMS="${KERNEL_PARAMS} debian-installer/theme=Clearlooks-Purple "
  fi

But it doesn't work, seemingly 'profiles' is not set when simple-cdd
loads the conf, and even though we build with the command:

    build-simple-cdd [...] --profiles "$profiles" [...]

Given the fact that uppercase variables are exported, and what we
actually want to change is KERNEL_PARAMS, it seems that the most
straightforward is just to preset it from build.sh.
1 year ago
Arnaud Rebillout 0cb485307f
Bump live-build requirement 1 year ago
Arnaud Rebillout ede795dc4c
Drop comment in simple-cdd.conf
Kali won't have a non-free-firmware component in the short-term.
1 year ago
Arnaud Rebillout 735f0fe1c6 Merge branch 'kali-purple' into 'master'
Add kali purple variant

See merge request kalilinux/build-scripts/live-build-config!29
1 year ago