josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

Add support for elxr #44

Open
zulcss wants to merge 1 commit from zulcss/mmdebstrap:main into main
pull from: zulcss/mmdebstrap:main
merge into: josch:main
Conversation 1 Commits 1 Files changed 1 +12
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9851edc111 - Show all commits

12
mmdebstrap
View file

@ -4087,6 +4087,7 @@ sub get_suite_by_vendor {
'ubuntu' => {}, 'ubuntu' => {},
'tanglu' => {}, 'tanglu' => {},
'kali' => {}, 'kali' => {},
'elxr' => {},
); );
# pre-fill with some known values # pre-fill with some known values
@ -4108,6 +4109,9 @@ sub get_suite_by_vendor {
foreach my $suite ('kali-dev', 'kali-rolling', 'kali-bleeding-edge') { foreach my $suite ('kali-dev', 'kali-rolling', 'kali-bleeding-edge') {
$suite_by_vendor{'kali'}->{$suite} = 0; $suite_by_vendor{'kali'}->{$suite} = 0;
} }
foreach my $suite ('aria') {
$suite_by_vendor{'elxr'}->{$suite} = 0;
}
foreach foreach
my $suite ('trusty', 'xenial', 'zesty', 'artful', 'bionic', 'cosmic') { my $suite ('trusty', 'xenial', 'zesty', 'artful', 'bionic', 'cosmic') {
$suite_by_vendor{'ubuntu'}->{$suite} = 0; $suite_by_vendor{'ubuntu'}->{$suite} = 0;
@ -4156,6 +4160,9 @@ sub get_suite_by_vendor {
} elsif ($target eq "kali" } elsif ($target eq "kali"
and not exists $suite_by_vendor{'kali'}->{$suite}) { and not exists $suite_by_vendor{'kali'}->{$suite}) {
$suite_by_vendor{'kali'}->{$suite} = 0; $suite_by_vendor{'kali'}->{$suite} = 0;
} elsif ($target eq "elxr"
josch commented 2024-09-13 12:41:56 +00:00
Review
Copy link

I was wondering why you check for "elxr" here. Debootstrap does not ship any such script or symlink and I do not see an open merge request on salsa nor an open bug in the Debian BTS. Is this an oversight or are you planning to add debootstrap support soon?

I was wondering why you check for "elxr" here. Debootstrap does not ship any such script or symlink and I do not see an open merge request on salsa nor an open bug in the Debian BTS. Is this an oversight or are you planning to add debootstrap support soon?
zulcss commented 2024-09-24 22:26:41 +00:00
Review
Copy link

Yeah I will be pushing the patch needed for debootstrap soon. I was away last week.

Yeah I will be pushing the patch needed for debootstrap soon. I was away last week.
and not exists $suite_by_vendor{'elxr'}->{$suite}) {
$suite_by_vendor{'elxr'}->{$suite} = 0;
} }
} }
closedir($dh); closedir($dh);
@ -4210,6 +4217,8 @@ sub get_keyring_by_suite {
return '/usr/share/keyrings/tanglu-archive-keyring.gpg'; return '/usr/share/keyrings/tanglu-archive-keyring.gpg';
} elsif ($vendor eq 'kali') { } elsif ($vendor eq 'kali') {
return '/usr/share/keyrings/kali-archive-keyring.gpg'; return '/usr/share/keyrings/kali-archive-keyring.gpg';
} elsif ($vendor eq 'elxr') {
return '/usr/share/keyrings/elxr-archive-keyring.gpg';
} else { } else {
error "unknown vendor: $vendor"; error "unknown vendor: $vendor";
} }
@ -4242,6 +4251,7 @@ sub get_sourceslist_by_suite {
my @ubuntustable = keys %{ $suite_by_vendor->{'ubuntu'} }; my @ubuntustable = keys %{ $suite_by_vendor->{'ubuntu'} };
my @tanglustable = keys %{ $suite_by_vendor->{'tanglu'} }; my @tanglustable = keys %{ $suite_by_vendor->{'tanglu'} };
my @kali = keys %{ $suite_by_vendor->{'kali'} }; my @kali = keys %{ $suite_by_vendor->{'kali'} };
my @elxr = keys %{ $suite_by_vendor->{'elxr'} };
my $mirror = 'http://deb.debian.org/debian'; my $mirror = 'http://deb.debian.org/debian';
my $secmirror = 'http://security.debian.org/debian-security'; my $secmirror = 'http://security.debian.org/debian-security';
@ -4279,6 +4289,8 @@ sub get_sourceslist_by_suite {
$mirror = 'http://archive.tanglu.org/tanglu'; $mirror = 'http://archive.tanglu.org/tanglu';
} elsif (any { $_ eq $suite } @kali) { } elsif (any { $_ eq $suite } @kali) {
$mirror = 'https://http.kali.org/kali'; $mirror = 'https://http.kali.org/kali';
} elsif (any { $_ eq $suite } @elxr) {
$mirror = 'https://mirror.elxr.dev';
} }
my $sourceslist = ''; my $sourceslist = '';
$sourceslist .= "deb$signedby $mirror $suite $compstr\n"; $sourceslist .= "deb$signedby $mirror $suite $compstr\n";