10:55 p.m.
Since commit e30a8743780a the BASELEVEL_REVISION is not used any more
Thus remove the dead code.
Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn>
---
configure.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/configure.c b/configure.c
index e0626318b8d5..5eeddfe34135 100644
--- a/configure.c
+++ b/configure.c
@@ -653,24 +653,6 @@ get_release:
} else
fprintf(stderr,
"WARNING: .rh_rpm_package file does not exist!\n");
-
- if ((fp = fopen("defs.h", "r")) == NULL) {
- perror("defs.h");
- return;
- }
-
- while (fgets(buf, 512, fp)) {
- if (strncmp(buf, "#define BASELEVEL_REVISION",
- strlen("#define BASELEVEL_REVISION")) == 0) {
- p = strstr(buf, "\"") + 1;
- strip_linefeeds(p);
- p[strlen(p)-1] = '\0';
- strcpy(target_data.release, p);
- break;
- }
- }
-
- fclose(fp);
}
void
--
2.51.1
10:55 p.m.
New subject: [PATCH 2/2] rename .rh_rpm_package to crash-release
The crash release nvr is set in .rh_rpm_package file, but it is
only a release number, not rpm related, thus change the filename
to crash-release, so that it is more obvious.
Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn>
---
Makefile | 12 +++++------
configure.c | 34 ++++++++++++++++----------------
.rh_rpm_package => crash-release | 0
3 files changed, 23 insertions(+), 23 deletions(-)
rename .rh_rpm_package => crash-release (100%)
diff --git a/Makefile b/Makefile
index 58b1326f2c16..46c43a42dbae 100644
--- a/Makefile
+++ b/Makefile
@@ -261,7 +261,7 @@ TARGET_CFLAGS=
CRASH_CFLAGS=-g -D${TARGET} ${TARGET_CFLAGS} ${GDB_FLAGS} ${CFLAGS}
GPL_FILES=
-TAR_FILES=${SOURCE_FILES} Makefile ${GPL_FILES} README .rh_rpm_package crash.8 \
+TAR_FILES=${SOURCE_FILES} Makefile ${GPL_FILES} README crash-release crash.8 \
${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES}
CSCOPE_FILES=${SOURCE_FILES}
@@ -630,7 +630,7 @@ show_files:
@if [ -f ${PROGRAM} ]; then \
./${PROGRAM} --no_scroll --no_crashrc -h README > README; fi
@echo ${SOURCE_FILES} Makefile ${GDB_FILES} ${GDB_PATCH_FILES} ${GPL_FILES} README \
- .rh_rpm_package crash.8 ${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES}
+ crash-release crash.8 ${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES}
ctags:
ctags ${SOURCE_FILES}
@@ -664,15 +664,15 @@ release_configure: make_configure
do_release:
@echo "CRASH VERSION: ${VERSION} GDB VERSION: ${GDB}"
- @if [ ! -f .rh_rpm_package ]; then \
- echo "no .rh_rpm_package exists!"; exit 1; fi
- @chmod 666 .rh_rpm_package
+ @if [ ! -f crash-release ]; then \
+ echo "no crash-release exists!"; exit 1; fi
+ @chmod 666 crash-release
@rm -rf ./RELDIR; mkdir ./RELDIR; mkdir ./RELDIR/${PROGRAM}-${VERSION}
@rm -f ${PROGRAM}-${VERSION}.tar.gz
@rm -f ${PROGRAM}-${VERSION}-${RELEASE}.src.rpm
@chown root ./RELDIR/${PROGRAM}-${VERSION}
@tar cf - ${SOURCE_FILES} Makefile ${GDB_FILES} ${GDB_PATCH_FILES} ${GPL_FILES} \
- .rh_rpm_package crash.8 ${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES} | \
+ crash-release crash.8 ${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES} | \
(cd ./RELDIR/${PROGRAM}-${VERSION}; tar xf -)
@cp ${GDB}.tar.gz ./RELDIR/${PROGRAM}-${VERSION}
@./${PROGRAM} --no_scroll --no_crashrc -h README > README
diff --git a/configure.c b/configure.c
index 5eeddfe34135..347f49293338 100644
--- a/configure.c
+++ b/configure.c
@@ -41,7 +41,7 @@
*
* -g define: GDB
*
- * -p Create or remove .rh_rpm_package file
+ * -p Create or remove crash-release file
*
* -q Don't print configuration
*
@@ -60,7 +60,7 @@
struct supported_gdb_version;
void build_configure(struct supported_gdb_version *);
void release_configure(char *, struct supported_gdb_version *);
-void make_rh_rpm_package(char *, int);
+void make_crash_release(char *, int);
void unconfigure(void);
void set_warnings(int);
void show_configuration(void);
@@ -328,10 +328,10 @@ main(int argc, char **argv)
release_configure(optarg, sp);
break;
case 'p':
- make_rh_rpm_package(optarg, 0);
+ make_crash_release(optarg, 0);
break;
case 'P':
- make_rh_rpm_package(optarg, 1);
+ make_crash_release(optarg, 1);
break;
case 'W':
case 'w':
@@ -630,9 +630,9 @@ get_release:
target_data.release[0] = '\0';
- if (file_exists(".rh_rpm_package")) {
- if ((fp = fopen(".rh_rpm_package", "r")) == NULL) {
- perror(".rh_rpm_package");
+ if (file_exists("crash-release")) {
+ if ((fp = fopen("crash-release", "r")) == NULL) {
+ perror("crash-release");
} else {
if (fgets(buf, 512, fp)) {
strip_linefeeds(buf);
@@ -641,10 +641,10 @@ get_release:
strcpy(target_data.release, buf);
} else
fprintf(stderr,
- "WARNING: .rh_rpm_package file is empty!\n");
+ "WARNING: crash-release file is empty!\n");
} else
fprintf(stderr,
- "WARNING: .rh_rpm_package file is empty!\n");
+ "WARNING: crash-release file is empty!\n");
fclose(fp);
if (strlen(target_data.release))
@@ -652,7 +652,7 @@ get_release:
}
} else
fprintf(stderr,
- "WARNING: .rh_rpm_package file does not exist!\n");
+ "WARNING: crash-release file does not exist!\n");
}
void
@@ -935,21 +935,21 @@ release_configure(char *gdb_version, struct supported_gdb_version
*sp)
}
/*
- * Create an .rh_rpm_package file if the passed-in variable is set.
+ * Create an crash-release file if the passed-in variable is set.
*/
void
-make_rh_rpm_package(char *package, int release)
+make_crash_release(char *package, int release)
{
char *p, *cur;
FILE *fp;
char buf[256];
if ((strcmp(package, "remove") == 0)) {
- if (file_exists(".rh_rpm_package")) {
- if (unlink(".rh_rpm_package")) {
+ if (file_exists("crash-release")) {
+ if (unlink("crash-release")) {
perror("unlink");
fprintf(stderr,
- "cannot remove .rh_rpm_package\n");
+ "cannot remove crash-release\n");
exit(1);
}
}
@@ -989,9 +989,9 @@ make_rh_rpm_package(char *package, int release)
}
}
- if ((fp = fopen(".rh_rpm_package", "w")) == NULL) {
+ if ((fp = fopen("crash-release", "w")) == NULL) {
perror("fopen");
- fprintf(stderr, "cannot open .rh_rpm_package\n");
+ fprintf(stderr, "cannot open crash-release\n");
exit(1);
}
diff --git a/.rh_rpm_package b/crash-release
similarity index 100%
rename from .rh_rpm_package
rename to crash-release
--
2.51.1
7:38 p.m.
Hi Dave,
For Patch 1 & 2, LGTM, ack.
Thanks,
Tao Liu
On Wed, Sep 9, 2026 at 3:56 PM Dave Young <yangrr.2009(a)tsinghua.org.cn> wrote:
Since commit e30a8743780a the BASELEVEL_REVISION is not used any more
Thus remove the dead code.
Signed-off-by: Dave Young <yangrr.2009(a)tsinghua.org.cn>
---
configure.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/configure.c b/configure.c
index e0626318b8d5..5eeddfe34135 100644
--- a/configure.c
+++ b/configure.c
@@ -653,24 +653,6 @@ get_release:
} else
fprintf(stderr,
"WARNING: .rh_rpm_package file does not exist!\n");
-
- if ((fp = fopen("defs.h", "r")) == NULL) {
- perror("defs.h");
- return;
- }
-
- while (fgets(buf, 512, fp)) {
- if (strncmp(buf, "#define BASELEVEL_REVISION",
- strlen("#define BASELEVEL_REVISION")) == 0) {
- p = strstr(buf, "\"") + 1;
- strip_linefeeds(p);
- p[strlen(p)-1] = '\0';
- strcpy(target_data.release, p);
- break;
- }
- }
-
- fclose(fp);
}
void
--
2.51.1
12
days inactive
13
days old
devel@lists.crash-utility.osci.io
2 comments
2 participants
participants (2)
-
Dave Young -
Tao Liu