Skip to content

Commit

Permalink
UBUNTU: SAUCE: Revert "ARM64: vdso32: Install vdso32 from vdso_install"
Browse files Browse the repository at this point in the history
This reverts commit 548af85,
which is causing failures in our test builds. Revert this
temporarily while we investigate.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
  • Loading branch information
Seth Forshee committed Aug 26, 2020
1 parent 6015604 commit 46e4315
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion arch/arm64/Makefile
Original file line number Diff line number Diff line change
@@ -158,7 +158,6 @@ zinstall install:
PHONY += vdso_install
vdso_install:
$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@

# We use MRPROPER_FILES and CLEAN_FILES now
archclean:
2 changes: 1 addition & 1 deletion arch/arm64/kernel/vdso32/Makefile
Original file line number Diff line number Diff line change
@@ -208,7 +208,7 @@ quiet_cmd_vdsosym = VDSOSYM $@
cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@

# Install commands for the unstripped file
quiet_cmd_vdso_install = INSTALL32 $@
quiet_cmd_vdso_install = INSTALL $@
cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/vdso32.so

vdso.so: $(obj)/vdso.so.dbg

0 comments on commit 46e4315

Please sign in to comment.