uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,56 @@
|
|||
From 5c5d878bf49bae5920c330482217477819ba9bc2 Mon Sep 17 00:00:00 2001
|
||||
From: Bernardo Meurer <bernardo@meurer.org>
|
||||
Date: Fri, 15 Oct 2021 23:22:50 -0700
|
||||
Subject: [PATCH 1/2] makefile: correctly sed paths
|
||||
|
||||
The default Makefile for tlp makes a mess with catenating `DESTDIR` to
|
||||
everything, but then not actualy using the catenated (_ prefixed)
|
||||
variables to sed it's `.in` files.
|
||||
|
||||
This patch makes sure that it correctly sets the paths, taking `DESTDIR`
|
||||
in account where it makes sense (e.g. /bin where we want $out/bin) but
|
||||
not where it doesn't (/etc/tlp.conf should be just that).
|
||||
|
||||
The reason DESTDIR is used at all, as opposed to the more appropriate
|
||||
PREFIX, is covered in the nix formula, and is (also) due to the Makefile
|
||||
being a bit "different."
|
||||
---
|
||||
Makefile | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e9bbab4..ab05720 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT)
|
||||
|
||||
SED = sed \
|
||||
-e "s|@TLPVER@|$(TLPVER)|g" \
|
||||
- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \
|
||||
- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \
|
||||
- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \
|
||||
- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \
|
||||
- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \
|
||||
+ -e "s|@TLP_SBIN@|$(_SBIN)|g" \
|
||||
+ -e "s|@TLP_TLIB@|$(_TLIB)|g" \
|
||||
+ -e "s|@TLP_FLIB@|$(_FLIB)|g" \
|
||||
+ -e "s|@TLP_ULIB@|$(_ULIB)|g" \
|
||||
+ -e "s|@TLP_BATD@|$(_BATD)|g" \
|
||||
-e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \
|
||||
-e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \
|
||||
- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \
|
||||
- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \
|
||||
- -e "s|@TLP_CONF@|$(TLP_CONF)|g" \
|
||||
+ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \
|
||||
+ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \
|
||||
+ -e "s|@TLP_CONF@|$(_CONF)|g" \
|
||||
-e "s|@TLP_RUN@|$(TLP_RUN)|g" \
|
||||
-e "s|@TLP_VAR@|$(TLP_VAR)|g" \
|
||||
- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g"
|
||||
+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g"
|
||||
|
||||
INFILES = \
|
||||
tlp \
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue