diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2021-04-08 15:29:36 +0800 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2021-04-17 06:47:18 -0700 |
| commit | 6b937081d958749b0b404af6bfd67a9bf9f985d0 (patch) | |
| tree | 881865fab37aa8e37f7832cab075357f601280e6 /meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch | |
| parent | 707bc1899d4c8b4ec30739f4bd40f48db00dab26 (diff) | |
| download | meta-openembedded-6b937081d958749b0b404af6bfd67a9bf9f985d0.tar.gz | |
debootstrap: 1.0.67 -> 1.0.123
- Excise all devices.tar.gz code
- Use yocto vars to override hardcoded dir to support native and nativesdk
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 605cb20bdffa2523a963439b47c21aa23adf5325)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch new file mode 100644 index 0000000000..12dd238108 --- /dev/null +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch @@ -0,0 +1,41 @@ +From 87d0174e8d56e7458dc94f05f82ab7a67a5cf7d0 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 8 Apr 2021 14:06:05 +0800 +Subject: [PATCH 1/2] support to override /usr/sbin and /usr/share + +Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 8516803..a2d8c00 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,14 +5,16 @@ all: + + clean: + +-DSDIR=$(DESTDIR)/usr/share/debootstrap ++datadir ?= "/usr/share" ++sbindir ?= "/usr/sbin" ++DSDIR=$(DESTDIR)${datadir}/debootstrap + install: + mkdir -p $(DSDIR)/scripts +- mkdir -p $(DESTDIR)/usr/sbin ++ mkdir -p $(DESTDIR)$(sbindir) + + cp -a scripts/* $(DSDIR)/scripts/ + install -o root -g root -m 0644 functions $(DSDIR)/ + +- sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap +- chown root:root $(DESTDIR)/usr/sbin/debootstrap +- chmod 0755 $(DESTDIR)/usr/sbin/debootstrap ++ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap ++ chown root:root $(DESTDIR)$(sbindir)/debootstrap ++ chmod 0755 $(DESTDIR)$(sbindir)/debootstrap +-- +2.17.1 + |