aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-06-28 23:36:20 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-06 11:29:46 +0800
commit513966ac0b0d89a59605f1c3fc6ac6f66cab8b88 (patch)
tree8e54d6aa025e60fd54afeaf511926cc03302ab43
parent318e9036776a8566db369f2c73a604b77f9bde24 (diff)
downloadmeta-anaconda-513966ac0b0d89a59605f1c3fc6ac6f66cab8b88.tar.gz
meta-anaconda-513966ac0b0d89a59605f1c3fc6ac6f66cab8b88.tar.bz2
meta-anaconda-513966ac0b0d89a59605f1c3fc6ac6f66cab8b88.zip
python3-anaconda re-organize local patch: merge 0021-tweak-default-nfs-mount-point.patch to 0003-tweak-iso-mount-dir-and-kernel-name.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0003-tweak-iso-mount-dir-and-kernel-name.patch19
-rw-r--r--recipes-installer/anaconda/files/0021-tweak-default-nfs-mount-point.patch30
-rwxr-xr-xrecipes-installer/anaconda/python3-anaconda_30.25.6.bb1
3 files changed, 13 insertions, 37 deletions
diff --git a/recipes-installer/anaconda/files/0003-tweak-iso-mount-dir-and-kernel-name.patch b/recipes-installer/anaconda/files/0003-tweak-iso-mount-dir-and-kernel-name.patch
index 6bc449c..4711d39 100644
--- a/recipes-installer/anaconda/files/0003-tweak-iso-mount-dir-and-kernel-name.patch
+++ b/recipes-installer/anaconda/files/0003-tweak-iso-mount-dir-and-kernel-name.patch
@@ -1,25 +1,27 @@
-From 9a5284a3de79cfe9bceb6daf434b4cc0cb7dbdf4 Mon Sep 17 00:00:00 2001
+From 367fc710a94d802ace273c7aebb8f5f96647370b Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 24 Jun 2019 14:45:50 +0800
-Subject: [PATCH 3/3] tweak iso mount dir and kernel name
+Subject: [PATCH] tweak iso mount dir and kernel name
- Tweak iso mount dir based on WRLinux
- Tweak kernel name based on OE
+- Tweak nfs mount point of base repository to "/media/source"
+
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- pyanaconda/core/constants.py | 4 ++--
+ pyanaconda/core/constants.py | 6 +++---
pyanaconda/payload/__init__.py | 18 +++++++++++-------
- 2 files changed, 13 insertions(+), 9 deletions(-)
+ 2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
-index 8910d48..5322a82 100644
+index 8910d48..cdf5ef6 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
-@@ -52,8 +52,8 @@ TRANSLATIONS_UPDATE_DIR = "/tmp/updates/po"
+@@ -52,12 +52,12 @@ TRANSLATIONS_UPDATE_DIR = "/tmp/updates/po"
VIRTIO_PORT = "/dev/virtio-ports/org.fedoraproject.anaconda.log.0"
ANACONDA_CLEANUP = "anaconda-cleanup"
@@ -30,6 +32,11 @@ index 8910d48..5322a82 100644
DRACUT_ISODIR = "/run/install/source"
ISO_DIR = MOUNT_DIR + "/isodir"
IMAGE_DIR = MOUNT_DIR + "/image"
+-INSTALL_TREE = MOUNT_DIR + "/source"
++INSTALL_TREE = "/media/source"
+ BASE_REPO_NAME = "anaconda"
+
+ # Get list of repo names witch should be used as base repo
diff --git a/pyanaconda/payload/__init__.py b/pyanaconda/payload/__init__.py
index 849b424..7c65d29 100644
--- a/pyanaconda/payload/__init__.py
diff --git a/recipes-installer/anaconda/files/0021-tweak-default-nfs-mount-point.patch b/recipes-installer/anaconda/files/0021-tweak-default-nfs-mount-point.patch
deleted file mode 100644
index e1ef61c..0000000
--- a/recipes-installer/anaconda/files/0021-tweak-default-nfs-mount-point.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e0df68f5cb6bc37dbae156db3a2754b05444334b Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Tue, 24 Jul 2018 14:10:34 +0800
-Subject: [PATCH 21/65] tweak default nfs mount point
-
-Tweak nfs mount point of base repository to "/media/source".
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- pyanaconda/core/constants.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
-index bfdf6b0..f706fc0 100644
---- a/pyanaconda/core/constants.py
-+++ b/pyanaconda/core/constants.py
-@@ -57,7 +57,7 @@ DRACUT_REPODIR = MOUNT_DIR + "/Packages"
- DRACUT_ISODIR = "/run/install/source"
- ISO_DIR = MOUNT_DIR + "/isodir"
- IMAGE_DIR = MOUNT_DIR + "/image"
--INSTALL_TREE = MOUNT_DIR + "/source"
-+INSTALL_TREE = "/media/source"
- BASE_REPO_NAME = "anaconda"
- ANACONDA_BUS_ADDR_FILE = "/run/anaconda/bus.address"
- ANACONDA_DATA_DIR = "/usr/share/anaconda"
---
-2.7.4
-
diff --git a/recipes-installer/anaconda/python3-anaconda_30.25.6.bb b/recipes-installer/anaconda/python3-anaconda_30.25.6.bb
index 5bfd933..898ea00 100755
--- a/recipes-installer/anaconda/python3-anaconda_30.25.6.bb
+++ b/recipes-installer/anaconda/python3-anaconda_30.25.6.bb
@@ -62,7 +62,6 @@ SRC_URI = "git://github.com/rhinstaller/anaconda;protocol=https;branch=f30-relea
file://0017-invisible-help-button.patch \
file://0018-disable-non-implemented-functions.patch \
file://0019-support-UEFI-boot.patch \
- file://0021-tweak-default-nfs-mount-point.patch \
file://0022-fix-quoted-empty-string-failed.patch \
file://0023-do-not-support-ISO-hold-by-hard-drive-partitions.patch \
file://0024-fix-cannot-stat-usr-share-gettext-gettext.h.patch \