[kernel] r15034 - people/waldi/s390/s390-tools/debian/patches
Bastian Blank
waldi at alioth.debian.org
Wed Jan 27 16:05:18 UTC 2010
Author: waldi
Date: Wed Jan 27 16:05:09 2010
New Revision: 15034
Log:
debian/patches/install.patch, debian/patches/zipl-optional.patch: Really update.
Modified:
people/waldi/s390/s390-tools/debian/patches/install.patch
people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch
Modified: people/waldi/s390/s390-tools/debian/patches/install.patch
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/install.patch Wed Jan 27 15:53:26 2010 (r15033)
+++ people/waldi/s390/s390-tools/debian/patches/install.patch Wed Jan 27 16:05:09 2010 (r15034)
@@ -174,14 +174,15 @@
rm -f *.o *~ vmur
--- a/zipl/src/Makefile
+++ b/zipl/src/Makefile
-@@ -15,8 +15,8 @@
+@@ -15,9 +15,9 @@
$(LINK) -Wl,-z,noexecstack $^ ../boot/data.o -o $@
install: all
- $(INSTALL) -d -m 755 $(BINDIR)
-- $(INSTALL) -c zipl $(BINDIR)
+ $(INSTALL) -d $(BINDIR)
-+ $(INSTALL) zipl $(BINDIR)
+ $(INSTALL) -c zipl $(BINDIR)
+- $(INSTALL) -m 755 $(wildcard zipl_helper.*) $(TOOLS_LIBDIR)
++ $(INSTALL) $(wildcard zipl_helper.*) $(TOOLS_LIBDIR)
clean:
rm -f *.o zipl
Modified: people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch Wed Jan 27 15:53:26 2010 (r15033)
+++ people/waldi/s390/s390-tools/debian/patches/zipl-optional.patch Wed Jan 27 16:05:09 2010 (r15034)
@@ -4,22 +4,22 @@
#define SCAN_SECTION_NUM 7
--#define SCAN_KEYWORD_NUM 14
-+#define SCAN_KEYWORD_NUM 15
+-#define SCAN_KEYWORD_NUM 19
++#define SCAN_KEYWORD_NUM 20
enum scan_id {
scan_id_empty = 0,
-@@ -40,6 +40,7 @@
- scan_keyword_defaultmenu = 11,
- scan_keyword_tape = 12,
- scan_keyword_mvdump = 13,
-+ scan_keyword_optional = 14,
+@@ -45,6 +45,7 @@
+ scan_keyword_targetgeometry = 16,
+ scan_keyword_targetblocksize = 17,
+ scan_keyword_targetoffset = 18,
++ scan_keyword_optional = 19,
};
enum scan_section_type {
--- a/zipl/src/bootmap.c
+++ b/zipl/src/bootmap.c
-@@ -793,6 +793,12 @@
+@@ -796,6 +796,12 @@
for (i=0; i < job->data.menu.num; i++) {
switch (job->data.menu.entry[i].id) {
case job_ipl:
@@ -34,41 +34,49 @@
job->data.menu.entry[i].name,
--- a/zipl/src/scan.c
+++ b/zipl/src/scan.c
-@@ -28,24 +28,24 @@
-
- /* Determines which keyword may be present in which section */
- enum scan_key_state scan_key_table[SCAN_SECTION_NUM][SCAN_KEYWORD_NUM] = {
--/* defa dump dump imag para parm ramd segm targ prom time defa tape mv
-- * ult to tofs e mete file isk ent et pt out ultm dump
-+/* defa dump dump imag para parm ramd segm targ prom time defa tape mv opti
-+ * ult to tofs e mete file isk ent et pt out ultm dump onal
+@@ -32,32 +32,32 @@
+ * ult to tofs e mete file isk ent et pt out ultm dump
* rs enu
+ *
+- * targ targ targ targ targ
+- * etba etty etge etbl etof
++ * targ targ targ targ targ opti
++ * etba etty etge etbl etof onal
+ * se pe omet ocks fset
+ * ry ize
*/
/* defaultboot */
-- {opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv},
-+ {opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv},
+ {opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv,
+- inv, inv, inv, inv, inv},
++ inv, inv, inv, inv, inv, inv},
/* ipl */
-- {inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv},
-+ {inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv, opt},
+ {inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv,
+- opt, opt, opt, opt, opt},
++ opt, opt, opt, opt, opt, opt},
/* segment load */
-- {inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv},
-+ {inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv, inv},
+ {inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv,
+- inv, inv, inv, inv, inv},
++ inv, inv, inv, inv, inv, inv},
/* part dump */
-- {inv, req, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv, inv, inv},
-+ {inv, req, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv, inv, inv, inv},
+ {inv, req, inv, inv, inv, inv, inv, inv, opt, inv, inv, inv, inv, inv,
+- inv, inv, inv, inv, inv},
++ inv, inv, inv, inv, inv, inv},
/* fs dump */
-- {inv, inv, req, inv, opt, opt, inv, inv, req, inv, inv, inv, inv, inv},
-+ {inv, inv, req, inv, opt, opt, inv, inv, req, inv, inv, inv, inv, inv, inv},
+ {inv, inv, req, inv, opt, opt, inv, inv, req, inv, inv, inv, inv, inv,
+- inv, inv, inv, inv, inv},
++ inv, inv, inv, inv, inv, inv},
/* ipl tape */
-- {inv, inv, inv, req, opt, opt, opt, inv, inv, inv, inv, inv, req, inv},
-+ {inv, inv, inv, req, opt, opt, opt, inv, inv, inv, inv, inv, req, inv, inv},
+ {inv, inv, inv, req, opt, opt, opt, inv, inv, inv, inv, inv, req, inv,
+- inv, inv, inv, inv, inv},
++ inv, inv, inv, inv, inv, inv},
/* multi volume dump */
-- {inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, req}
-+ {inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, req, inv}
+ {inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, req,
+- inv, inv, inv, inv, inv}
++ inv, inv, inv, inv, inv, inv}
};
/* Mapping of keyword IDs to strings */
-@@ -66,7 +66,8 @@
+@@ -83,7 +83,8 @@
{ "target", scan_keyword_target},
{ "prompt", scan_keyword_prompt},
{ "timeout", scan_keyword_timeout},
@@ -77,7 +85,7 @@
+ { "optional", scan_keyword_optional},
};
-
+ /* Retrieve name of keyword identified by ID. */
--- a/zipl/include/job.h
+++ b/zipl/include/job.h
@@ -12,6 +12,8 @@
@@ -87,9 +95,9 @@
+#include <stdbool.h>
+
#include "zipl.h"
+ #include "disk.h"
-
-@@ -34,6 +36,8 @@
+@@ -46,6 +48,8 @@
address_t image_addr;
address_t parm_addr;
address_t ramdisk_addr;
@@ -100,7 +108,7 @@
struct job_segment_data {
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
-@@ -390,14 +390,20 @@
+@@ -432,14 +432,20 @@
static int
@@ -123,7 +131,7 @@
error_text("Image file '%s'", ipl->image);
} else {
error_text("Image file '%s' in section '%s'",
-@@ -409,7 +415,13 @@
+@@ -451,7 +457,13 @@
if (ipl->ramdisk != NULL) {
rc = misc_check_readable_file(ipl->ramdisk);
if (rc) {
@@ -138,7 +146,7 @@
error_text("Ramdisk file '%s'", ipl->ramdisk);
} else {
error_text("Ramdisk file '%s' in section '%s'",
-@@ -498,9 +510,13 @@
+@@ -540,9 +552,13 @@
switch (menu->entry[i].id) {
case job_ipl:
rc = check_job_ipl_data(&menu->entry[i].data.ipl,
@@ -153,7 +161,7 @@
break;
case job_dump_fs:
rc = check_job_dump_fs_data(
-@@ -654,7 +670,7 @@
+@@ -696,7 +712,7 @@
case job_print_version:
break;
case job_ipl:
@@ -162,7 +170,7 @@
case job_menu:
return check_job_menu_data(&job->data.menu);
case job_segment:
-@@ -863,6 +879,8 @@
+@@ -956,6 +972,8 @@
DEFAULT_RAMDISK_ADDRESS;
}
}
More information about the Kernel-svn-changes
mailing list