Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
makeiso
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Luis Guzmán
makeiso
Commits
3a8676cc
Commit
3a8676cc
authored
3 years ago
by
Luis Guzmán
Browse files
Options
Downloads
Plain Diff
Merge branch 'makeiso_fix1' into 'master'
Makeiso fix1 See merge request
trisquel/makeiso!9
parents
d5ab22b1
fa76f18b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
efi-local-repo-builder.sh
+1
-0
1 addition, 0 deletions
efi-local-repo-builder.sh
makeiso.sh
+4
-11
4 additions, 11 deletions
makeiso.sh
with
5 additions
and
11 deletions
efi-local-repo-builder.sh
+
1
−
0
View file @
3a8676cc
...
...
@@ -55,6 +55,7 @@ mkdir -p ${CODENAME}_efi_repo/amd64/{conf,incoming}
#Get packages
apt-get
-c
$LOCAL_APT
/apt.conf
\
--print-uris
install
efibootmgr
\
grub-efi-amd64
\
grub-efi-amd64-bin |
\
cut
-d
\'
-f2
|grep http
>
${
CODENAME
}
_efi_repo/amd64/incoming/efi_wget.list
...
...
This diff is collapsed.
Click to expand it.
makeiso.sh
+
4
−
11
View file @
3a8676cc
...
...
@@ -261,12 +261,13 @@ mount -t sysfs none $CHROOT/sys
mount
-t
tmpfs none
$CHROOT
/tmp
echo
"127.0.0.1 localhost"
>
$CHROOT
/etc/hosts
#
https://builds.trisquel.org/efi-image-repo/nabia_efi_repo.tar.gz
EFI_LOCAL_REPO
=
"http://builds.trisquel.org/efi
/
"
DISTRO_REPO
=
$(
curl
-s
$EFI_LOCAL_REPO
|grep
$CODENAME
|awk
-F
'"'
'{print$6}'
)
#
Setup local EFI repository
EFI_LOCAL_REPO
=
"http://builds.trisquel.org/efi"
DISTRO_REPO
=
$(
curl
-s
$EFI_LOCAL_REPO
/
|grep
$CODENAME
|awk
-F
'"'
'{print$6}'
)
#Get and copy repo to master
wget
-q
$EFI_LOCAL_REPO
/
$DISTRO_REPO
rm
-rf
master/
{
dists,pool
}
tar
-zxvf
$DISTRO_REPO
--directory
master/
rm
$DISTRO_REPO
...
...
@@ -518,14 +519,6 @@ cd $WORKDIR
[
$ARCH
=
"i386"
]
&&
SUBARCH
=
i686
||
SUBARCH
=
amd64
if
[
-d
master/pool
]
&&
[
-d
master/distro
]
;
then
echo
"There is already an updated repo available, continuing..."
else
echo
"Copying static repo..."
cp
files/repo/
$ARCH
/pool master
-a
||
true
cp
files/repo/
$ARCH
/dists master
-a
fi
#VERSION=$VERSION-$(date +%Y%m%d)
NAME
=
${
DIST
}
_
${
VERSION
}
_
$SUBARCH
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment