Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
trisquel
package-helpers
Commits
747d5db6
Commit
747d5db6
authored
1 year ago
by
Luis Guzmán
Browse files
Options
Downloads
Patches
Plain Diff
debian-installer: update ld permissions patch.
parent
742eb1c3
No related branches found
No related tags found
1 merge request
!1134
debian-installer: update ld permissions patch.
Pipeline
#1034
passed
1 year ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
helpers/DATA/debian-installer/chmod_755_ld-linux2.patch
+9
-4
9 additions, 4 deletions
helpers/DATA/debian-installer/chmod_755_ld-linux2.patch
helpers/make-debian-installer
+2
-2
2 additions, 2 deletions
helpers/make-debian-installer
with
11 additions
and
6 deletions
helpers/DATA/debian-installer/chmod_755_ld-linux.patch
→
helpers/DATA/debian-installer/chmod_755_ld-linux
2
.patch
+
9
−
4
View file @
747d5db6
--- a/build/Makefile 2023-05-17 02:42:44.707584584 -0600
+++ b/build/Makefile 2023-05-17 02:44:14.563930750 -0600
@@ -440,6 +440,9 @@
diff --git a/build/Makefile b/build/Makefile
index c073a32..cace03d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -431,6 +431,12 @@
endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
ifdef KERNELVERSION
+ifeq ($(DEB_HOST_ARCH),
amd64
)
+if
n
eq ($(DEB_HOST_ARCH),
ppc64el
)
+ chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld-linux*
+endif
+ifeq ($(DEB_HOST_ARCH),ppc64el)
+ chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld*.so*
+endif
# Set up modules.dep, ensure there is at least one standard dir (kernel
# in this case), so depmod will use its prune list for archs with no
...
...
This diff is collapsed.
Click to expand it.
helpers/make-debian-installer
+
2
−
2
View file @
747d5db6
...
...
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION
=
1
3
VERSION
=
1
4
EXTERNAL
=
'deb-src http://ftp.debian.org/debian bullseye main'
REPOKEY
=
0E98404D386FA1D9
NETINST
=
true
...
...
@@ -139,7 +139,7 @@ grep -rl cdrom-core-modules- build/pkg-lists/ |xargs sed -i '/cdrom-core-modules
grep
-rl
cdebconf-gtk-entropy build/config/ | xargs
sed
-i
's/cdebconf-gtk-entropy//'
# Ensure that ld-linux is executable
patch
--no-backup-if-mismatch
-p1
<
$DATA
/chmod_755_ld-linux.patch
patch
--no-backup-if-mismatch
-p1
<
$DATA
/chmod_755_ld-linux
2
.patch
# HACK: include liblzma.so and liblz4.so from host into iso image, as runtime dependencies of zstd
sed
'/not packaged as a udeb/a\\tcp /lib/$(DEB_HOST_MULTIARCH)/liblzma.so.5* $(TREE)/lib/$(DEB_HOST_MULTIARCH)'
-i
build/Makefile
...
...
This diff is collapsed.
Click to expand it.
Simon Josefsson
@jas
mentioned in merge request
!1133 (closed)
·
1 year ago
mentioned in merge request
!1133 (closed)
mentioned in merge request !1133
Toggle commit list
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