diff options
19 files changed, 1254 insertions, 0 deletions
diff --git a/main/s390-tools/0001-zipl-flags.patch b/main/s390-tools/0001-zipl-flags.patch new file mode 100644 index 0000000000..da642fec93 --- /dev/null +++ b/main/s390-tools/0001-zipl-flags.patch @@ -0,0 +1,25 @@ +From 584fd01d78e94d98ea2cb21954789fcc844fabcb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Fri, 22 Apr 2016 13:21:50 +0200 +Subject: [PATCH] zipl: disable strict aliasing for bootloader + +--- + zipl/boot/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile +index bb8a19d..f1f4401 100644 +--- a/zipl/boot/Makefile ++++ b/zipl/boot/Makefile +@@ -4,7 +4,7 @@ include ../../common.mak + CFLAGS_BOOT = -Os -g -I../include -D__ASSEMBLY__ \ + -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ + -fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \ +- -fno-delete-null-pointer-checks \ ++ -fno-delete-null-pointer-checks -fno-strict-aliasing \ + -fexec-charset=IBM1047 -m64 -mpacked-stack \ + -mstack-size=8192 -mstack-guard=128 -msoft-float $(WARNFLAGS) + +-- +2.7.4 + diff --git a/main/s390-tools/0002-musl-fixes.patch b/main/s390-tools/0002-musl-fixes.patch new file mode 100644 index 0000000000..62af24ba1b --- /dev/null +++ b/main/s390-tools/0002-musl-fixes.patch @@ -0,0 +1,855 @@ +diff --git a/dasdfmt/dasdfmt.h b/dasdfmt/dasdfmt.h +index b9edabd..b642342 100644 +--- a/dasdfmt/dasdfmt.h ++++ b/dasdfmt/dasdfmt.h +@@ -304,13 +304,13 @@ static struct option dasdfmt_getopt_long_options[]= + }; + + typedef struct bootstrap1 { +- u_int32_t key; +- u_int32_t data[6]; ++ uint32_t key; ++ uint32_t data[6]; + } __attribute__ ((packed)) bootstrap1_t; + + typedef struct bootstrap2 { +- u_int32_t key; +- u_int32_t data[36]; ++ uint32_t key; ++ uint32_t data[36]; + } __attribute__ ((packed)) bootstrap2_t; + + typedef struct dasdfmt_info { +diff --git a/dasdview/dasdview.c b/dasdview/dasdview.c +index 0c1581a..8515fb6 100644 +--- a/dasdview/dasdview.c ++++ b/dasdview/dasdview.c +@@ -654,7 +654,7 @@ dasdview_read_vtoc(dasdview_info_t *info) + volume_label_t vlabel; + format1_label_t tmp; + unsigned long maxblk, pos; +- u_int64_t vtocblk; ++ uint64_t vtocblk; + int i; + + pos = info->dasd_info.label_block * info->blksize; +@@ -674,7 +674,7 @@ dasdview_read_vtoc(dasdview_info_t *info) + exit(-1); + } + +- vtocblk = (u_int64_t) vtoc_get_cyl_from_cchhb(&vlabel.vtoc) * ++ vtocblk = (uint64_t) vtoc_get_cyl_from_cchhb(&vlabel.vtoc) * + info->geo.heads * info->geo.sectors + + vtoc_get_head_from_cchhb(&vlabel.vtoc) * info->geo.sectors + + vlabel.vtoc.b; +@@ -2118,7 +2118,7 @@ static void dasdview_print_raw_track(char *trackdata, + { + struct eckd_count *ecount; + char *data; +- u_int32_t record; ++ uint32_t record; + + record = 0; + data = trackdata; +@@ -2145,8 +2145,8 @@ static void dasdview_print_raw_track(char *trackdata, + + static void dasdview_view_raw(dasdview_info_t *info) + { +- u_int64_t residual, trckstart, trckend, track, trckbuffsize; +- u_int64_t tracks_to_read, trckcount, i; ++ uint64_t residual, trckstart, trckend, track, trckbuffsize; ++ uint64_t tracks_to_read, trckcount, i; + char *trackdata; + char *data; + int rc; +diff --git a/dasdview/dasdview.h b/dasdview/dasdview.h +index cc72e0a..8e34a10 100644 +--- a/dasdview/dasdview.h ++++ b/dasdview/dasdview.h +@@ -214,7 +214,7 @@ typedef struct dasdview_info + int dasd_info_version; + int blksize; + struct hd_geometry geo; +- u_int32_t hw_cylinders; ++ uint32_t hw_cylinders; + + unsigned long long begin; + unsigned long long size; +diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c +index ccc7046..fb28b1e 100644 +--- a/fdasd/fdasd.c ++++ b/fdasd/fdasd.c +@@ -61,9 +61,9 @@ setpos (fdasd_anchor_t *anc, int dsn, int pos) + anc->partno[dsn] = pos; + } + +-static u_int32_t get_usable_cylinders(fdasd_anchor_t *anc) ++static uint32_t get_usable_cylinders(fdasd_anchor_t *anc) + { +- u_int32_t cyl; ++ uint32_t cyl; + + /* large volume */ + if (anc->f4->DS4DEVCT.DS4DSCYL == LV_COMPAT_CYL && +@@ -72,7 +72,7 @@ static u_int32_t get_usable_cylinders(fdasd_anchor_t *anc) + /* normal volume */ + if (anc->f4->DS4DEVCT.DS4DEVFG & ALTERNATE_CYLINDERS_USED) + cyl = anc->f4->DS4DEVCT.DS4DSCYL - +- (u_int16_t) anc->f4->DS4DEVAC; ++ (uint16_t) anc->f4->DS4DEVAC; + else + cyl = anc->f4->DS4DEVCT.DS4DSCYL; + return cyl; +@@ -81,7 +81,7 @@ static u_int32_t get_usable_cylinders(fdasd_anchor_t *anc) + static void get_addr_of_highest_f1_f8_label(fdasd_anchor_t *anc, cchhb_t *addr) + { + +- u_int8_t record; ++ uint8_t record; + /* We have to count the follwing labels: + * one format 4 + * one format 5 +@@ -2446,12 +2446,12 @@ fdasd_get_partition_data (fdasd_anchor_t *anc, extent_t *part_extent, + partition_info_t *part_info) + { + unsigned long start, stop, limit; +- u_int32_t cc, cyl; +- u_int16_t hh, head; ++ uint32_t cc, cyl; ++ uint16_t hh, head; + cchh_t llimit,ulimit; + partition_info_t *part_tmp; + char mesg[48]; +- u_int8_t b1, b2; ++ uint8_t b1, b2; + + start = FIRST_USABLE_TRK; + +@@ -2764,8 +2764,8 @@ fdasd_auto_partition(fdasd_anchor_t *anc) + cchh_t llimit,ulimit; + cchhb_t hf1; + extent_t ext; +- u_int32_t cyl; +- u_int16_t head; ++ uint32_t cyl; ++ uint16_t head; + + if (!anc->silent) + printf("auto-creating one partition for the whole disk...\n"); +diff --git a/fdasd/fdasd.h b/fdasd/fdasd.h +index f22444e..39ea480 100644 +--- a/fdasd/fdasd.h ++++ b/fdasd/fdasd.h +@@ -188,7 +188,7 @@ struct fdasd_options options = { + }; + + typedef struct partition_info { +- u_int8_t used; ++ uint8_t used; + unsigned long start_trk; + unsigned long end_trk; + unsigned long len_trk; +@@ -223,7 +223,7 @@ typedef struct fdasd_anchor { + int option_reuse; + int option_recreate; + int partno[USABLE_PARTITIONS]; +- u_int16_t dev_type; ++ uint16_t dev_type; + unsigned int used_partitions; + unsigned long label_pos; + unsigned int blksize; +@@ -236,8 +236,8 @@ typedef struct fdasd_anchor { + partition_info_t *last; + volume_label_t *vlabel; + config_data_t confdata[USABLE_PARTITIONS]; +- u_int32_t hw_cylinders; +- u_int32_t formatted_cylinders; ++ uint32_t hw_cylinders; ++ uint32_t formatted_cylinders; + } fdasd_anchor_t; + + enum offset {lower, upper}; +diff --git a/include/vtoc.h b/include/vtoc.h +index ea5b1c2..592200c 100644 +--- a/include/vtoc.h ++++ b/include/vtoc.h +@@ -21,6 +21,7 @@ + #include <time.h> + #include <fcntl.h> + #include <unistd.h> ++#include <stdint.h> + + #include <sys/stat.h> + #include <sys/ioctl.h> +@@ -56,27 +57,27 @@ struct hd_geometry { + + typedef struct ttr + { +- u_int16_t tt; +- u_int8_t r; ++ uint16_t tt; ++ uint8_t r; + } __attribute__ ((packed)) ttr_t; + + typedef struct cchhb + { +- u_int16_t cc; +- u_int16_t hh; +- u_int8_t b; ++ uint16_t cc; ++ uint16_t hh; ++ uint8_t b; + } __attribute__ ((packed)) cchhb_t; + + typedef struct cchh + { +- u_int16_t cc; +- u_int16_t hh; ++ uint16_t cc; ++ uint16_t hh; + } __attribute__ ((packed)) cchh_t; + + typedef struct labeldate + { +- u_int8_t year; +- u_int16_t day; ++ uint8_t year; ++ uint16_t day; + } __attribute__ ((packed)) labeldate_t; + + /* +@@ -96,7 +97,7 @@ typedef struct volume_label + char volkey[4]; /* volume key = volume label */ + char vollbl[4]; /* volume label */ + char volid[6]; /* volume identifier */ +- u_int8_t security; /* security byte */ ++ uint8_t security; /* security byte */ + cchhb_t vtoc; /* VTOC address */ + char res1[5]; /* reserved */ + char cisize[4]; /* CI-size for FBA,... */ +@@ -112,8 +113,8 @@ typedef struct volume_label + + typedef struct extent + { +- u_int8_t typeind; /* extent type indicator */ +- u_int8_t seqno; /* extent sequence number */ ++ uint8_t typeind; /* extent type indicator */ ++ uint8_t seqno; /* extent sequence number */ + cchh_t llimit; /* starting point of this extent */ + cchh_t ulimit; /* ending point of this extent */ + } __attribute__ ((packed)) extent_t; +@@ -121,16 +122,16 @@ typedef struct extent + + typedef struct dev_const + { +- u_int16_t DS4DSCYL; /* number of logical cyls */ +- u_int16_t DS4DSTRK; /* number of tracks in a logical cylinder */ +- u_int16_t DS4DEVTK; /* device track length */ +- u_int8_t DS4DEVI; /* non-last keyed record overhead */ +- u_int8_t DS4DEVL; /* last keyed record overhead */ +- u_int8_t DS4DEVK; /* non-keyed record overhead differential */ +- u_int8_t DS4DEVFG; /* flag byte */ +- u_int16_t DS4DEVTL; /* device tolerance */ +- u_int8_t DS4DEVDT; /* number of DSCB's per track */ +- u_int8_t DS4DEVDB; /* number of directory blocks per track */ ++ uint16_t DS4DSCYL; /* number of logical cyls */ ++ uint16_t DS4DSTRK; /* number of tracks in a logical cylinder */ ++ uint16_t DS4DEVTK; /* device track length */ ++ uint8_t DS4DEVI; /* non-last keyed record overhead */ ++ uint8_t DS4DEVL; /* last keyed record overhead */ ++ uint8_t DS4DEVK; /* non-keyed record overhead differential */ ++ uint8_t DS4DEVFG; /* flag byte */ ++ uint16_t DS4DEVTL; /* device tolerance */ ++ uint8_t DS4DEVDT; /* number of DSCB's per track */ ++ uint8_t DS4DEVDB; /* number of directory blocks per track */ + } __attribute__ ((packed)) dev_const_t; + + /* +@@ -140,33 +141,33 @@ typedef struct dev_const + typedef struct format1_label + { + char DS1DSNAM[44]; /* data set name */ +- u_int8_t DS1FMTID; /* format identifier */ ++ uint8_t DS1FMTID; /* format identifier */ + unsigned char DS1DSSN[6];/* data set serial number */ +- u_int16_t DS1VOLSQ; /* volume sequence number */ ++ uint16_t DS1VOLSQ; /* volume sequence number */ + labeldate_t DS1CREDT; /* creation date: ydd */ + labeldate_t DS1EXPDT; /* expiration date */ +- u_int8_t DS1NOEPV; /* number of extents on volume */ +- u_int8_t DS1NOBDB; /* no. of bytes used in last direction blk */ +- u_int8_t DS1FLAG1; /* flag 1 */ ++ uint8_t DS1NOEPV; /* number of extents on volume */ ++ uint8_t DS1NOBDB; /* no. of bytes used in last direction blk */ ++ uint8_t DS1FLAG1; /* flag 1 */ + unsigned char DS1SYSCD[13]; /* system code */ + labeldate_t DS1REFD; /* date last referenced */ +- u_int8_t DS1SMSFG; /* system managed storage indicators */ +- u_int8_t DS1SCXTF; /* sec. space extension flag byte */ +- u_int16_t DS1SCXTV; /* secondary space extension value */ +- u_int8_t DS1DSRG1; /* data set organisation byte 1 */ +- u_int8_t DS1DSRG2; /* data set organisation byte 2 */ +- u_int8_t DS1RECFM; /* record format */ +- u_int8_t DS1OPTCD; /* option code */ +- u_int16_t DS1BLKL; /* block length */ +- u_int16_t DS1LRECL; /* record length */ +- u_int8_t DS1KEYL; /* key length */ +- u_int16_t DS1RKP; /* relative key position */ +- u_int8_t DS1DSIND; /* data set indicators */ +- u_int8_t DS1SCAL1; /* secondary allocation flag byte */ ++ uint8_t DS1SMSFG; /* system managed storage indicators */ ++ uint8_t DS1SCXTF; /* sec. space extension flag byte */ ++ uint16_t DS1SCXTV; /* secondary space extension value */ ++ uint8_t DS1DSRG1; /* data set organisation byte 1 */ ++ uint8_t DS1DSRG2; /* data set organisation byte 2 */ ++ uint8_t DS1RECFM; /* record format */ ++ uint8_t DS1OPTCD; /* option code */ ++ uint16_t DS1BLKL; /* block length */ ++ uint16_t DS1LRECL; /* record length */ ++ uint8_t DS1KEYL; /* key length */ ++ uint16_t DS1RKP; /* relative key position */ ++ uint8_t DS1DSIND; /* data set indicators */ ++ uint8_t DS1SCAL1; /* secondary allocation flag byte */ + char DS1SCAL3[3]; /* secondary allocation quantity */ + ttr_t DS1LSTAR; /* last used track and block on track */ +- u_int16_t DS1TRBAL; /* space remaining on last used track */ +- u_int16_t res1; /* reserved */ ++ uint16_t DS1TRBAL; /* space remaining on last used track */ ++ uint16_t res1; /* reserved */ + extent_t DS1EXT1; /* first extent description */ + extent_t DS1EXT2; /* second extent description */ + extent_t DS1EXT3; /* third extent description */ +@@ -178,7 +179,7 @@ typedef struct format3_label + { + char DS3KEYID[4]; /* key identifier */ + extent_t DS3EXTNT[4]; /* first 4 extent descriptions */ +- u_int8_t DS3FMTID; /* format identifier */ ++ uint8_t DS3FMTID; /* format identifier */ + extent_t DS3ADEXT[9]; /* last 9 extent description */ + cchhb_t DS3PTRDS; /* pointer to next format3 DSCB */ + } __attribute__ ((packed)) format3_label_t; +@@ -187,15 +188,15 @@ typedef struct format3_label + typedef struct format4_label + { + char DS4KEYCD[44]; /* key code for VTOC labels: 44 times 0x04 */ +- u_int8_t DS4IDFMT; /* format identifier */ ++ uint8_t DS4IDFMT; /* format identifier */ + cchhb_t DS4HPCHR; /* highest address of a format 1 DSCB */ +- u_int16_t DS4DSREC; /* number of available DSCB's */ ++ uint16_t DS4DSREC; /* number of available DSCB's */ + cchh_t DS4HCCHH; /* CCHH of next available alternate track */ +- u_int16_t DS4NOATK; /* number of remaining alternate tracks */ +- u_int8_t DS4VTOCI; /* VTOC indicators */ +- u_int8_t DS4NOEXT; /* number of extents in VTOC */ +- u_int8_t DS4SMSFG; /* system managed storage indicators */ +- u_int8_t DS4DEVAC; /* number of alternate cylinders. ++ uint16_t DS4NOATK; /* number of remaining alternate tracks */ ++ uint8_t DS4VTOCI; /* VTOC indicators */ ++ uint8_t DS4NOEXT; /* number of extents in VTOC */ ++ uint8_t DS4SMSFG; /* system managed storage indicators */ ++ uint8_t DS4DEVAC; /* number of alternate cylinders. + Subtract from first two bytes of + DS4DEVSZ to get number of usable + cylinders. can be zero. valid +@@ -208,21 +209,21 @@ typedef struct format4_label + char DS4F6PTR[5]; /* pointer to first format 6 DSCB */ + extent_t DS4VTOCE; /* VTOC extent description */ + char res2[10]; /* reserved */ +- u_int8_t DS4EFLVL; /* extended free-space management level */ ++ uint8_t DS4EFLVL; /* extended free-space management level */ + cchhb_t DS4EFPTR; /* pointer to extended free-space info */ + char res3; /* reserved */ +- u_int32_t DS4DCYL; /* number of logical cyls */ ++ uint32_t DS4DCYL; /* number of logical cyls */ + char res4[2]; /* reserved */ +- u_int8_t DS4DEVF2; /* device flags */ ++ uint8_t DS4DEVF2; /* device flags */ + char res5; /* reserved */ + } __attribute__ ((packed)) format4_label_t; + + + typedef struct ds5ext + { +- u_int16_t t; /* RTA of the first track of free extent */ +- u_int16_t fc; /* number of whole cylinders in free ext. */ +- u_int8_t ft; /* number of remaining free tracks */ ++ uint16_t t; /* RTA of the first track of free extent */ ++ uint16_t fc; /* number of whole cylinders in free ext. */ ++ uint8_t ft; /* number of remaining free tracks */ + } __attribute__ ((packed)) ds5ext_t; + + +@@ -231,7 +232,7 @@ typedef struct format5_label + char DS5KEYID[4]; /* key identifier */ + ds5ext_t DS5AVEXT; /* first available (free-space) extent. */ + ds5ext_t DS5EXTAV[7]; /* seven available extents */ +- u_int8_t DS5FMTID; /* format identifier */ ++ uint8_t DS5FMTID; /* format identifier */ + ds5ext_t DS5MAVET[18]; /* eighteen available extents */ + cchhb_t DS5PTRDS; /* pointer to next format5 DSCB */ + } __attribute__ ((packed)) format5_label_t; +@@ -239,8 +240,8 @@ typedef struct format5_label + + typedef struct ds7ext + { +- u_int32_t a; /* starting RTA value */ +- u_int32_t b; /* ending RTA value + 1 */ ++ uint32_t a; /* starting RTA value */ ++ uint32_t b; /* ending RTA value + 1 */ + } __attribute__ ((packed)) ds7ext_t; + + +@@ -248,7 +249,7 @@ typedef struct format7_label + { + char DS7KEYID[4]; /* key identifier */ + ds7ext_t DS7EXTNT[5]; /* space for 5 extent descriptions */ +- u_int8_t DS7FMTID; /* format identifier */ ++ uint8_t DS7FMTID; /* format identifier */ + ds7ext_t DS7ADEXT[11]; /* space for 11 extent descriptions */ + char res1[2]; /* reserved */ + cchhb_t DS7PTRDS; /* pointer to next FMT7 DSCB */ +@@ -257,12 +258,12 @@ typedef struct format7_label + + typedef struct format9_label + { +- u_int8_t DS9KEYID; /* key code for format 9 labels (0x09) */ +- u_int8_t DS9SUBTY; /* subtype (0x01) */ +- u_int8_t DS9NUMF9; /* number of F9 datasets */ +- u_int8_t res1[41]; /* reserved */ +- u_int8_t DS9FMTID; /* format identifier */ +- u_int8_t res2[90]; /* reserved */ ++ uint8_t DS9KEYID; /* key code for format 9 labels (0x09) */ ++ uint8_t DS9SUBTY; /* subtype (0x01) */ ++ uint8_t DS9NUMF9; /* number of F9 datasets */ ++ uint8_t res1[41]; /* reserved */ ++ uint8_t DS9FMTID; /* format identifier */ ++ uint8_t res2[90]; /* reserved */ + cchhb_t DS9PTRDS; /* pointer to next DSCB */ + } __attribute__ ((packed)) format9_label_t; + +@@ -270,31 +271,31 @@ char * vtoc_ebcdic_enc (char *source, char *target, int l); + char * vtoc_ebcdic_dec (char *source, char *target, int l); + void vtoc_set_extent ( + extent_t * ext, +- u_int8_t typeind, +- u_int8_t seqno, ++ uint8_t typeind, ++ uint8_t seqno, + cchh_t * lower, + cchh_t * upper); + void vtoc_set_cchh ( + cchh_t * addr, +- u_int32_t cc, +- u_int16_t hh); +-u_int32_t vtoc_get_cyl_from_cchh(cchh_t *addr); +-u_int16_t vtoc_get_head_from_cchh(cchh_t *addr); ++ uint32_t cc, ++ uint16_t hh); ++uint32_t vtoc_get_cyl_from_cchh(cchh_t *addr); ++uint16_t vtoc_get_head_from_cchh(cchh_t *addr); + void vtoc_set_cchhb ( + cchhb_t * addr, +- u_int32_t cc, +- u_int16_t hh, +- u_int8_t b); +-u_int32_t vtoc_get_cyl_from_cchhb(cchhb_t *addr); +-u_int16_t vtoc_get_head_from_cchhb(cchhb_t *addr); +-u_int64_t cchhb2blk(cchhb_t *p, struct hd_geometry *geo); +-u_int64_t cchh2blk (cchh_t *p, struct hd_geometry *geo); +-u_int32_t cchh2trk (cchh_t *p, struct hd_geometry *geo); ++ uint32_t cc, ++ uint16_t hh, ++ uint8_t b); ++uint32_t vtoc_get_cyl_from_cchhb(cchhb_t *addr); ++uint16_t vtoc_get_head_from_cchhb(cchhb_t *addr); ++uint64_t cchhb2blk(cchhb_t *p, struct hd_geometry *geo); ++uint64_t cchh2blk (cchh_t *p, struct hd_geometry *geo); ++uint32_t cchh2trk (cchh_t *p, struct hd_geometry *geo); + + void vtoc_set_date ( + labeldate_t * d, +- u_int8_t year, +- u_int16_t day); ++ uint8_t year, ++ uint16_t day); + + void vtoc_volume_label_init ( + volume_label_t *vlabel); +@@ -359,12 +360,12 @@ void vtoc_init_format4_label ( + unsigned int tracks, + unsigned int blocks, + unsigned int blksize, +- u_int16_t dev_type); ++ uint16_t dev_type); + + void vtoc_update_format4_label ( + format4_label_t *f4, + cchhb_t *highest_f1, +- u_int16_t unused_update); ++ uint16_t unused_update); + + void vtoc_init_format5_label ( + format5_label_t *f5); +@@ -373,17 +374,17 @@ void vtoc_update_format5_label_add ( + format5_label_t *f5, + int verbose, + int trk, +- u_int16_t a, +- u_int16_t b, +- u_int8_t c); ++ uint16_t a, ++ uint16_t b, ++ uint8_t c); + + void vtoc_update_format5_label_del ( + format5_label_t *f5, + int verbose, + int trk, +- u_int16_t a, +- u_int16_t b, +- u_int8_t c); ++ uint16_t a, ++ uint16_t b, ++ uint8_t c); + + void vtoc_init_format7_label ( + format7_label_t *f7); +@@ -391,14 +392,14 @@ void vtoc_init_format7_label ( + void vtoc_update_format7_label_add ( + format7_label_t *f7, + int verbose, +- u_int32_t a, +- u_int32_t b); ++ uint32_t a, ++ uint32_t b); + + void vtoc_update_format7_label_del ( + format7_label_t *f7, + int verbose, +- u_int32_t a, +- u_int32_t b); ++ uint32_t a, ++ uint32_t b); + + void vtoc_init_format8_label ( + unsigned int blksize, +@@ -418,10 +419,10 @@ void vtoc_set_freespace( + format7_label_t *f7, + char ch, + int verbose, +- u_int32_t start, +- u_int32_t stop, +- u_int32_t cyl, +- u_int32_t trk); ++ uint32_t start, ++ uint32_t stop, ++ uint32_t cyl, ++ uint32_t trk); + + + #endif /* VTOC_H */ +diff --git a/libutil/Makefile b/libutil/Makefile +index e392bc3..2ffc49e 100644 +--- a/libutil/Makefile ++++ b/libutil/Makefile +@@ -1,6 +1,7 @@ + include ../common.mak + + ALL_CPPFLAGS += -I../include ++LDLIBS = $(LIBEXECINFO_LIBS) + + lib = libutil.a + +diff --git a/libutil/util_opt.c b/libutil/util_opt.c +index a1a5cda..39540b6 100644 +--- a/libutil/util_opt.c ++++ b/libutil/util_opt.c +@@ -6,7 +6,6 @@ + * Copyright IBM Corp. 2016 + */ + +-#include <argz.h> + #include <libgen.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/libvmdump/vm_dump.cpp b/libvmdump/vm_dump.cpp +index 53923ce..f2e460c 100644 +--- a/libvmdump/vm_dump.cpp ++++ b/libvmdump/vm_dump.cpp +@@ -14,7 +14,7 @@ + + Dump::DumpType VMDump::getDumpType(const char* inputFileName) + { +- char fmbk_id[8] = {0xc8, 0xc3, 0xd7, 0xc4, 0xc6, 0xd4, 0xc2, 0xd2}; ++ unsigned char fmbk_id[8] = {0xc8, 0xc3, 0xd7, 0xc4, 0xc6, 0xd4, 0xc2, 0xd2}; + struct _fir_basic fir; + struct _fmbk fmbk; + struct _adsr adsr; +@@ -84,7 +84,7 @@ Dump::DumpType VMDump::getDumpType(const char* inputFileName) + + VMDump::VMDump(const char *fileName) : Dump(fileName, "rb") + { +- char fmbk_id[8] = {0xc8, 0xc3, 0xd7, 0xc4, 0xc6, 0xd4, 0xc2, 0xd2}; ++ unsigned char fmbk_id[8] = {0xc8, 0xc3, 0xd7, 0xc4, 0xc6, 0xd4, 0xc2, 0xd2}; + + ebcdicAsciiConv = iconv_open("ISO-8859-1", "EBCDIC-US"); + +diff --git a/libvtoc/vtoc.c b/libvtoc/vtoc.c +index 048587b..9763f2e 100644 +--- a/libvtoc/vtoc.c ++++ b/libvtoc/vtoc.c +@@ -200,7 +200,7 @@ char * vtoc_ebcdic_dec (char *source, char *target, int l) + /* + * + */ +-void vtoc_set_extent (extent_t *ext, u_int8_t typeind, u_int8_t seqno, ++void vtoc_set_extent (extent_t *ext, uint8_t typeind, uint8_t seqno, + cchh_t *lower, cchh_t *upper) + { + ext->typeind = typeind; +@@ -213,17 +213,17 @@ void vtoc_set_extent (extent_t *ext, u_int8_t typeind, u_int8_t seqno, + /* + * + */ +-void vtoc_set_cchh (cchh_t *addr, u_int32_t cc, u_int16_t hh) ++void vtoc_set_cchh (cchh_t *addr, uint32_t cc, uint16_t hh) + { +- addr->cc = (u_int16_t) cc; ++ addr->cc = (uint16_t) cc; + addr->hh = cc >> 16; + addr->hh <<= 4; + addr->hh |= hh; + } + +-u_int32_t vtoc_get_cyl_from_cchh(cchh_t *addr) ++uint32_t vtoc_get_cyl_from_cchh(cchh_t *addr) + { +- u_int32_t cyl; ++ uint32_t cyl; + + /*decode cylinder for large volumes */ + cyl = addr->hh & 0xFFF0; +@@ -232,7 +232,7 @@ u_int32_t vtoc_get_cyl_from_cchh(cchh_t *addr) + return cyl; + } + +-u_int16_t vtoc_get_head_from_cchh(cchh_t *addr) ++uint16_t vtoc_get_head_from_cchh(cchh_t *addr) + { + /* decode heads for large volumes */ + return addr->hh & 0x000F; +@@ -241,7 +241,7 @@ u_int16_t vtoc_get_head_from_cchh(cchh_t *addr) + /* + * + */ +-static void vtoc_set_ttr (ttr_t *addr, u_int16_t tt, u_int8_t r) ++static void vtoc_set_ttr (ttr_t *addr, uint16_t tt, uint8_t r) + { + addr->tt = tt; + addr->r = r; +@@ -251,18 +251,18 @@ static void vtoc_set_ttr (ttr_t *addr, u_int16_t tt, u_int8_t r) + /* + * + */ +-void vtoc_set_cchhb (cchhb_t *addr, u_int32_t cc, u_int16_t hh, u_int8_t b) ++void vtoc_set_cchhb (cchhb_t *addr, uint32_t cc, uint16_t hh, uint8_t b) + { +- addr->cc = (u_int16_t) cc; ++ addr->cc = (uint16_t) cc; + addr->hh = cc >> 16; + addr->hh <<= 4; + addr->hh |= hh; + addr->b = b; + } + +-u_int32_t vtoc_get_cyl_from_cchhb(cchhb_t *addr) ++uint32_t vtoc_get_cyl_from_cchhb(cchhb_t *addr) + { +- u_int32_t cyl; ++ uint32_t cyl; + + /* decode cylinder for large volumes */ + cyl = addr->hh & 0xFFF0; +@@ -271,7 +271,7 @@ u_int32_t vtoc_get_cyl_from_cchhb(cchhb_t *addr) + return cyl; + } + +-u_int16_t vtoc_get_head_from_cchhb(cchhb_t *addr) ++uint16_t vtoc_get_head_from_cchhb(cchhb_t *addr) + { + /* decode heads for large volumes */ + return addr->hh & 0x000F; +@@ -283,22 +283,22 @@ u_int16_t vtoc_get_head_from_cchhb(cchhb_t *addr) + * Note: Record zero is special, so first block on a track is + * in record 1! + */ +-u_int64_t cchhb2blk(cchhb_t *p, struct hd_geometry *geo) ++uint64_t cchhb2blk(cchhb_t *p, struct hd_geometry *geo) + { +- return (u_int64_t) vtoc_get_cyl_from_cchhb(p) * ++ return (uint64_t) vtoc_get_cyl_from_cchhb(p) * + geo->heads * geo->sectors + + vtoc_get_head_from_cchhb(p) * geo->sectors + + p->b; + } + +-u_int64_t cchh2blk (cchh_t *p, struct hd_geometry *geo) { ++uint64_t cchh2blk (cchh_t *p, struct hd_geometry *geo) { + +- return (u_int64_t) vtoc_get_cyl_from_cchh(p) * ++ return (uint64_t) vtoc_get_cyl_from_cchh(p) * + geo->heads * geo->sectors + + vtoc_get_head_from_cchh(p) * geo->sectors; + } + +-u_int32_t cchh2trk (cchh_t *p, struct hd_geometry *geo) { ++uint32_t cchh2trk (cchh_t *p, struct hd_geometry *geo) { + + return vtoc_get_cyl_from_cchh(p) * geo->heads + + vtoc_get_head_from_cchh(p); +@@ -307,7 +307,7 @@ u_int32_t cchh2trk (cchh_t *p, struct hd_geometry *geo) { + /* + * + */ +-void vtoc_set_date (labeldate_t * d, u_int8_t year, u_int16_t day) ++void vtoc_set_date (labeldate_t * d, uint8_t year, uint16_t day) + { + d->year = year; + d->day = day; +@@ -627,7 +627,7 @@ vtoc_init_format4_label ( + unsigned int tracks, + unsigned int blocks, + unsigned int blksize, +- u_int16_t dev_type) ++ uint16_t dev_type) + { + int i; + +@@ -750,8 +750,8 @@ static void vtoc_init_format_1_8_label ( + f1->DS1VOLSQ = 0x0001; + + vtoc_set_date(&f1->DS1CREDT, +- (u_int8_t) creatime->tm_year, +- (u_int16_t) creatime->tm_yday); ++ (uint8_t) creatime->tm_year, ++ (uint16_t) creatime->tm_yday); + /* expires never - 99 365 */ + vtoc_set_date(&f1->DS1EXPDT, + 0x63, +@@ -762,8 +762,8 @@ static void vtoc_init_format_1_8_label ( + vtoc_ebcdic_enc("IBM LINUX ", str, 13); + strncpy((char *)f1->DS1SYSCD, str, 13); + vtoc_set_date(&f1->DS1REFD, +- (u_int8_t) creatime->tm_year, +- (u_int16_t) creatime->tm_yday); ++ (uint8_t) creatime->tm_year, ++ (uint16_t) creatime->tm_yday); + f1->DS1SMSFG = 0x00; + f1->DS1SCXTF = 0x00; + f1->DS1SCXTV = 0x0000; +@@ -833,7 +833,7 @@ void + vtoc_update_format4_label ( + format4_label_t *f4, + cchhb_t *highest_f1, +- u_int16_t unused_update) ++ uint16_t unused_update) + { + /* update highest address of a format 1 label */ + memcpy(&f4->DS4HPCHR, highest_f1, sizeof(cchhb_t)); +@@ -895,9 +895,9 @@ void + vtoc_update_format5_label_add (format5_label_t *f5, + int verbose, + int trk, +- u_int16_t a, +- u_int16_t b, +- u_int8_t c) ++ uint16_t a, ++ uint16_t b, ++ uint8_t c) + { + ds5ext_t *ext = NULL, *tmp = NULL; + int i; +@@ -990,9 +990,9 @@ void + vtoc_update_format5_label_del (format5_label_t *f5, + int verbose, + int trk, +- u_int16_t a, +- u_int16_t b, +- u_int8_t c) ++ uint16_t a, ++ uint16_t b, ++ uint8_t c) + { + ds5ext_t *ext; + int i, counter=0; +@@ -1060,9 +1060,9 @@ vtoc_update_format5_label_del (format5_label_t *f5, + ((ext->t + ext->fc*trk + ext->ft) > (a + b*trk + c))) + { + /* partition devides free space into 2 pieces */ +- u_int16_t x = a + b*trk + c; +- u_int16_t w,y; +- u_int8_t z; ++ uint16_t x = a + b*trk + c; ++ uint16_t w,y; ++ uint8_t z; + + w = (ext->t + ext->fc*trk + ext->ft) - (a + b*trk + c); + y = w / trk; +@@ -1151,7 +1151,7 @@ vtoc_reorganize_FMT7_extents (format7_label_t *f7) + * add a free space extent description to the VTOC FMT7 DSCB + */ + void vtoc_update_format7_label_add (format7_label_t *f7, int verbose, +- u_int32_t a, u_int32_t b) ++ uint32_t a, uint32_t b) + { + ds7ext_t *ext = NULL, *tmp = NULL; + int i; +@@ -1225,7 +1225,7 @@ void vtoc_update_format7_label_add (format7_label_t *f7, int verbose, + * remove a free space extent description from the VTOC FMT7 DSCB + */ + void vtoc_update_format7_label_del (format7_label_t *f7, int verbose, +- u_int32_t a, u_int32_t b) ++ uint32_t a, uint32_t b) + { + ds7ext_t *ext; + int i, counter=0; +@@ -1296,7 +1296,7 @@ void vtoc_update_format7_label_del (format7_label_t *f7, int verbose, + */ + void vtoc_set_freespace(format4_label_t *f4, format5_label_t *f5, + format7_label_t *f7, char ch, int verbose, +- u_int32_t start, u_int32_t stop, u_int32_t cyl, u_int32_t trk) ++ uint32_t start, uint32_t stop, uint32_t cyl, uint32_t trk) + { + if ((cyl * trk) > BIG_DISK_SIZE) { + if (ch == '+') { +@@ -1319,12 +1319,12 @@ void vtoc_set_freespace(format4_label_t *f4, format5_label_t *f5, + f4->DS4EFLVL = 0x07; + vtoc_set_cchhb(&f4->DS4EFPTR, 0x0000, 0x0001, 0x03); + } else { +- u_int16_t x,y; +- u_int8_t z; ++ uint16_t x,y; ++ uint8_t z; + +- x = (u_int16_t) start; +- y = (u_int16_t) ((stop - start + 1) / trk); +- z = (u_int8_t) ((stop - start + 1) % trk); ++ x = (uint16_t) start; ++ y = (uint16_t) ((stop - start + 1) / trk); ++ z = (uint8_t) ((stop - start + 1) % trk); + + if (ch == '+') { + vtoc_update_format5_label_add(f5, verbose, trk, +diff --git a/vmur/vmur.cpp b/vmur/vmur.cpp +index f2d4a02..9299e7c 100644 +--- a/vmur/vmur.cpp ++++ b/vmur/vmur.cpp +@@ -1542,7 +1542,7 @@ enum spoolfile_fmt get_spoolfile_fmt(struct vmur *info, + struct splink_page *buf) + { + struct splink_record *rec; +- char netdata_id[5] = {0xc9, 0xd5, 0xd4, 0xd9, 0xf0}; /* EBCDIC: INMR0 */ ++ unsigned char netdata_id[5] = {0xc9, 0xd5, 0xd4, 0xd9, 0xf0}; /* EBCDIC: INMR0 */ + unsigned int i; + + rec = (struct splink_record *) &buf->data; diff --git a/main/s390-tools/0003-major-minor.patch b/main/s390-tools/0003-major-minor.patch new file mode 100644 index 0000000000..1137523212 --- /dev/null +++ b/main/s390-tools/0003-major-minor.patch @@ -0,0 +1,24 @@ +diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c +index fb28b1e..218dca3 100644 +--- a/fdasd/fdasd.c ++++ b/fdasd/fdasd.c +@@ -9,6 +9,7 @@ + + #include <getopt.h> + #include <stdio.h> ++#include <sys/sysmacros.h> + + #include "zt_common.h" + #include "vtoc.h" +diff --git a/tape390/tape390_common.c b/tape390/tape390_common.c +index f4f1433..71402b8 100644 +--- a/tape390/tape390_common.c ++++ b/tape390/tape390_common.c +@@ -9,6 +9,7 @@ + *************************************************************************/ + + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <stdio.h> + #include <fcntl.h> + #include <stdlib.h> diff --git a/main/s390-tools/0004-missing-time-header.patch b/main/s390-tools/0004-missing-time-header.patch new file mode 100644 index 0000000000..f8787743b9 --- /dev/null +++ b/main/s390-tools/0004-missing-time-header.patch @@ -0,0 +1,24 @@ +diff --git a/mon_tools/mon_procd.c b/mon_tools/mon_procd.c +index 9b52057..d7dbee3 100644 +--- a/mon_tools/mon_procd.c ++++ b/mon_tools/mon_procd.c +@@ -8,6 +8,7 @@ + */ + #include <unistd.h> + #include <sys/vfs.h> ++#include <sys/time.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +diff --git a/ziomon/ziomon_msg_tools.h b/ziomon/ziomon_msg_tools.h +index 383cdd4..1aa16ff 100644 +--- a/ziomon/ziomon_msg_tools.h ++++ b/ziomon/ziomon_msg_tools.h +@@ -10,6 +10,7 @@ + #ifndef ZIOMON_MSG__TOOLS_H + #define ZIOMON_MSG__TOOLS_H + ++#include <time.h> + #include "ziomon_dacc.h" + + void conv_blkiomon_v2_to_v3(struct message *msg); diff --git a/main/s390-tools/0005-dump2tar-linking-order.patch b/main/s390-tools/0005-dump2tar-linking-order.patch new file mode 100644 index 0000000000..4276472ec3 --- /dev/null +++ b/main/s390-tools/0005-dump2tar-linking-order.patch @@ -0,0 +1,14 @@ +Without this line, linker flags are placed before object files + +diff --git a/dump2tar/src/Makefile b/dump2tar/src/Makefile +index a2ba26f..12f9034 100644 +--- a/dump2tar/src/Makefile ++++ b/dump2tar/src/Makefile +@@ -22,6 +22,7 @@ check_dep_zlib: + all: check_dep_zlib dump2tar + + dump2tar: $(core_objects) dump2tar.o $(libs) ++ $(CC) $(core_objects) dump2tar.o $(libs) -o $@ $(ALL_LDFLAGS) $(LIBEXECINFO_LIBS) + + install: dump2tar + $(INSTALL) -c dump2tar $(DESTDIR)$(USRBINDIR) diff --git a/main/s390-tools/0006-define-path-mounted.patch b/main/s390-tools/0006-define-path-mounted.patch new file mode 100644 index 0000000000..4c7761c2ab --- /dev/null +++ b/main/s390-tools/0006-define-path-mounted.patch @@ -0,0 +1,15 @@ +Picked from include/paths.h. +See more http://www.openwall.com/lists/musl/2014/03/29/5 + +diff --git a/hyptop/helper.c b/hyptop/helper.c +index 1212bda..733fd4e 100644 +--- a/hyptop/helper.c ++++ b/hyptop/helper.c +@@ -27,6 +27,7 @@ + #include "hyptop.h" + #include "sd.h" + ++#define _PATH_MOUNTED "/etc/mtab" + /* + * Globals + */ diff --git a/main/s390-tools/0007-tunedasd-no-need-error-h.patch b/main/s390-tools/0007-tunedasd-no-need-error-h.patch new file mode 100644 index 0000000000..d33d7e3ada --- /dev/null +++ b/main/s390-tools/0007-tunedasd-no-need-error-h.patch @@ -0,0 +1,12 @@ +diff --git a/tunedasd/src/tunedasd.c b/tunedasd/src/tunedasd.c +index 917000d..f779d5a 100644 +--- a/tunedasd/src/tunedasd.c ++++ b/tunedasd/src/tunedasd.c +@@ -17,7 +17,6 @@ + #include <stdarg.h> + + #include "disk.h" +-#include "error.h" + #include "zt_common.h" + + /* Full tool name */ diff --git a/main/s390-tools/0008-iucvterm-no-nls.patch b/main/s390-tools/0008-iucvterm-no-nls.patch new file mode 100644 index 0000000000..eec9b170ff --- /dev/null +++ b/main/s390-tools/0008-iucvterm-no-nls.patch @@ -0,0 +1,13 @@ +diff --git a/iucvterm/src/Makefile b/iucvterm/src/Makefile +index bc90aa7..9d298d8 100644 +--- a/iucvterm/src/Makefile ++++ b/iucvterm/src/Makefile +@@ -7,7 +7,7 @@ GETTEXT_TEXTDOMAIN = iucvterm + endif + + ALL_CPPFLAGS += -I../include -I../../include +-ALL_CPPFLAGS += -DUSE_NLS -DGETTEXT_TEXTDOMAIN=\"$(GETTEXT_TEXTDOMAIN)\" ++ALL_CPPFLAGS += -DGETTEXT_TEXTDOMAIN=\"$(GETTEXT_TEXTDOMAIN)\" + #ALL_CPPFLAGS += -D__DEBUG__ + + PROGRAMS = iucvconn iucvtty diff --git a/main/s390-tools/0009-zdev-libexecinfo.patch b/main/s390-tools/0009-zdev-libexecinfo.patch new file mode 100644 index 0000000000..3b8ef43ce8 --- /dev/null +++ b/main/s390-tools/0009-zdev-libexecinfo.patch @@ -0,0 +1,11 @@ +diff --git a/zdev/src/Makefile b/zdev/src/Makefile +index f3adffc..434046f 100644 +--- a/zdev/src/Makefile ++++ b/zdev/src/Makefile +@@ -1,6 +1,7 @@ + # Common definitions + include ../../common.mak + ++LDLIBS=$(LIBEXECINFO_LIBS) + ALL_CPPFLAGS += -I../../include -I ../include -std=gnu99 -Wno-unused-parameter \ + -Wno-missing-field-initializers diff --git a/main/s390-tools/0010-musl-s390x-signal-def.patch b/main/s390-tools/0010-musl-s390x-signal-def.patch new file mode 100644 index 0000000000..3c26b84742 --- /dev/null +++ b/main/s390-tools/0010-musl-s390x-signal-def.patch @@ -0,0 +1,15 @@ +It seems musl s390x port is missing some def + +diff --git a/zfcpdump/zfcpdump.c b/zfcpdump/zfcpdump.c +index 70df501..9d3c0f2 100644 +--- a/zfcpdump/zfcpdump.c ++++ b/zfcpdump/zfcpdump.c +@@ -11,6 +11,8 @@ + * Author(s): Michael Holzheu + */ + ++#include <asm-generic/signal-defs.h> ++ + #include <errno.h> + #include <string.h> + #include <dirent.h> diff --git a/main/s390-tools/0100-zipl-no-pie.patch b/main/s390-tools/0100-zipl-no-pie.patch new file mode 100644 index 0000000000..50e983e0a8 --- /dev/null +++ b/main/s390-tools/0100-zipl-no-pie.patch @@ -0,0 +1,54 @@ +diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile +index 6474aad..83771f1 100644 +--- a/zipl/boot/Makefile ++++ b/zipl/boot/Makefile +@@ -1,7 +1,7 @@ + # Common definitions + include ../../common.mak + +-CFLAGS_BOOT = -Os -g -I../include -D__ASSEMBLY__ \ ++CFLAGS_BOOT = -fno-pie -Os -g -I../include -D__ASSEMBLY__ \ + -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ + -fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \ + -fno-delete-null-pointer-checks -fno-strict-aliasing \ +@@ -54,11 +54,11 @@ stage3.exec: head.o stage3.o kdump3.o libc.o sclp.o sclp_stage3.o \ + }' \ + ); \ + case $$STAGE in \ +- 0) SFLAGS="-nostdlib -Wl,-Ttext,0";; \ +- 1) SFLAGS="-nostdlib -Wl,-Ttext,0x18";; \ +- 1b) SFLAGS="-nostdlib -Wl,-Ttext,0xE000";; \ +- 2) SFLAGS="-nostdlib -Wl,-T,stage2.lds";; \ +- 3) SFLAGS="-nostdlib -Wl,-T,stage3.lds";; \ ++ 0) SFLAGS="-no-pie -nostdlib -Wl,-Ttext,0";; \ ++ 1) SFLAGS="-no-pie -nostdlib -Wl,-Ttext,0x18";; \ ++ 1b) SFLAGS="-no-pie -nostdlib -Wl,-Ttext,0xE000";; \ ++ 2) SFLAGS="-no-pie -nostdlib -Wl,-T,stage2.lds";; \ ++ 3) SFLAGS="-no-pie -nostdlib -Wl,-T,stage3.lds";; \ + esac; \ + $(LINK) $$SFLAGS -m64 $^ -o $@ + +@@ -77,7 +77,7 @@ stage3.exec: head.o stage3.o kdump3.o libc.o sclp.o sclp_stage3.o \ + $< $@ + + data.o: $(FILES) +- $(LD) -r -b binary -o data.o $(FILES) ++ $(LD) -no-pie -r -b binary -o data.o $(FILES) + + data.h: data.o + rm -f data.h +diff --git a/zipl/src/Makefile b/zipl/src/Makefile +index 0ea0077..c526a46 100644 +--- a/zipl/src/Makefile ++++ b/zipl/src/Makefile +@@ -7,8 +7,8 @@ ALL_CPPFLAGS += -I../include -I../boot -I../../include \ + -DZFCPDUMP_FS_RD=$(ZFCPDUMP_FS_RD) \ + -DZFCPDUMP_PART_IMAGE=$(ZFCPDUMP_PART_IMAGE) \ + -DZFCPDUMP_PART_RD=$(ZFCPDUMP_PART_RD) \ +- -D_FILE_OFFSET_BITS=64 +-ALL_LDFLAGS += -Wl,-z,noexecstack ++ -D_FILE_OFFSET_BITS=64 -fno-pie ++ALL_LDFLAGS += -Wl,-z,noexecstack -no-pie + + libs = $(rootdir)/libutil/libutil.a \ + $(rootdir)/libu2s/libu2s.a diff --git a/main/s390-tools/0101-zipl-dont-optimize-size.patch b/main/s390-tools/0101-zipl-dont-optimize-size.patch new file mode 100644 index 0000000000..889dbf4750 --- /dev/null +++ b/main/s390-tools/0101-zipl-dont-optimize-size.patch @@ -0,0 +1,26 @@ +diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile +index 83771f1..f221dbf 100644 +--- a/zipl/boot/Makefile ++++ b/zipl/boot/Makefile +@@ -1,6 +1,8 @@ + # Common definitions + include ../../common.mak + ++ALL_CPPFLAGS := $(filter-out -Os,$(ALL_CPPFLAGS)) ++ALL_CFLAGS := $(filter-out -Os,$(ALL_CFLAGS)) + CFLAGS_BOOT = -fno-pie -Os -g -I../include -D__ASSEMBLY__ \ + -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \ + -fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \ +diff --git a/zipl/src/Makefile b/zipl/src/Makefile +index c526a46..24ec04f 100644 +--- a/zipl/src/Makefile ++++ b/zipl/src/Makefile +@@ -8,6 +8,8 @@ ALL_CPPFLAGS += -I../include -I../boot -I../../include \ + -DZFCPDUMP_PART_IMAGE=$(ZFCPDUMP_PART_IMAGE) \ + -DZFCPDUMP_PART_RD=$(ZFCPDUMP_PART_RD) \ + -D_FILE_OFFSET_BITS=64 -fno-pie ++ALL_CPPFLAGS := $(filter-out -Os,$(ALL_CPPFLAGS)) ++ALL_CFLAGS := $(filter-out -Os,$(ALL_CFLAGS)) + ALL_LDFLAGS += -Wl,-z,noexecstack -no-pie + + libs = $(rootdir)/libutil/libutil.a \ diff --git a/main/s390-tools/0200-dasdinfo-gnu-ext-hack.patch b/main/s390-tools/0200-dasdinfo-gnu-ext-hack.patch new file mode 100644 index 0000000000..289e670650 --- /dev/null +++ b/main/s390-tools/0200-dasdinfo-gnu-ext-hack.patch @@ -0,0 +1,14 @@ +diff --git a/dasdinfo/dasdinfo.c b/dasdinfo/dasdinfo.c +index 44a1178..7f65763 100644 +--- a/dasdinfo/dasdinfo.c ++++ b/dasdinfo/dasdinfo.c +@@ -32,6 +32,9 @@ + + #define MAX(x,y) ((x)<(y)?(y):(x)) + ++#define FTW_CONTINUE 0 ++#define FTW_STOP 1 ++ + static const char tool_name[] = "dasdinfo: zSeries DASD information program"; + static const char copyright_notice[] = "Copyright IBM Corp. 2007"; + diff --git a/main/s390-tools/0300-disable-program-using-gnu-ext.patch b/main/s390-tools/0300-disable-program-using-gnu-ext.patch new file mode 100644 index 0000000000..56766f6cb2 --- /dev/null +++ b/main/s390-tools/0300-disable-program-using-gnu-ext.patch @@ -0,0 +1,18 @@ +zconf : argz.h functions +cpuplugd : feenableexcept function + +diff --git a/Makefile b/Makefile +index a760c0f..203e7ed 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,8 +5,8 @@ include common.mak + + LIB_DIRS = libvtoc libu2s libutil libzds libdasd libvmdump + TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \ +- tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \ +- vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \ ++ tape390 osasnmpd qetharp ip_watcher qethconf scripts \ ++ vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \ + ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \ + systemd hmcdrvfs cpacfstats zdev dump2tar + SUB_DIRS = $(LIB_DIRS) $(TOOL_DIRS) diff --git a/main/s390-tools/APKBUILD b/main/s390-tools/APKBUILD new file mode 100644 index 0000000000..612d3b8936 --- /dev/null +++ b/main/s390-tools/APKBUILD @@ -0,0 +1,67 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Tuan M. Hoang <tmhoang@flatglobe.org> +pkgname=s390-tools +pkgver=1.37.0 +pkgrel=0 +pkgdesc="Utilities for Linux on IBM z Systems" +url="http://www.ibm.com/developerworks/linux/linux390/s390-tools.html" +arch="s390x" +license="GPL-2.0-or-later" +depends="linux-vanilla mkinitfs" +depends_dev="" +makedepends="$depends_dev linux-headers libexecinfo-dev zlib-dev fuse-dev ncurses-dev" +triggers="$pkgname.trigger=/boot" +install="$pkgname.post-install $pkgname.post-upgrade" +subpackages="$pkgname-doc" +source="http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/$pkgname-$pkgver.tar.bz2 + 0001-zipl-flags.patch + 0002-musl-fixes.patch + 0003-major-minor.patch + 0004-missing-time-header.patch + 0005-dump2tar-linking-order.patch + 0006-define-path-mounted.patch + 0007-tunedasd-no-need-error-h.patch + 0008-iucvterm-no-nls.patch + 0009-zdev-libexecinfo.patch + 0010-musl-s390x-signal-def.patch + + 0100-zipl-no-pie.patch + 0101-zipl-dont-optimize-size.patch + + 0200-dasdinfo-gnu-ext-hack.patch + 0300-disable-program-using-gnu-ext.patch + + s390-tools-script + " +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + make -j1 V=1 CFLAGS="$CFLAGS -D_GNU_SOURCE" \ + HAVE_SNMP=0 \ + HAVE_PFM=0 \ + LIBEXECINFO_LIBS="-lexecinfo" +} + +package() { + cd "$builddir" + make HAVE_SNMP=0 HAVE_PFM=0 DESTDIR="$pkgdir" install + install -m 755 "$srcdir"/s390-tools-script "$pkgdir"/sbin/s390-tools-script +} + +sha512sums="3667ba4eb7e2b74629958f530002953adebe6e41d6429c99ae5f82d1406d6963aacdc35b63114683c365b9fa40ac32b4c22f226918ecb53423e80f944d24cb9c s390-tools-1.37.0.tar.bz2 +3e1d0829e13bea69f48c556c2454b2927ffc59a7f4a04f7ebce41b9b5ed95ce963922fec9981e7ae62be801abbdc2cd27498399d0c4b8f9d10fae82dc3a9df85 0001-zipl-flags.patch +53917ef77142eb1304f7a900eb9a624b5bad5b263110f5875ab7710b52350e1b56d42d048b5bedc9ee6780d9f014c903f047f25d347ba677dfe141eb125b1543 0002-musl-fixes.patch +8a73e9d8e09af29cc04bc09a330ca019ec21bc49fe18468149458996c52e5c7951d9b917e2263162f1fd6e8a25f47c6ca737f7ceeec1d753d72f85e447a6ec01 0003-major-minor.patch +701d42e799bb7398b391ef299eb9f5488638cd162826ac8827205741159b746cbd6f4841b54fe6eb5f11dd143f63fb9689f7373b7df7adf9dcb1b3ed620820c8 0004-missing-time-header.patch +d4d707aadf095f48dd3ae79f60d17194e479d8a6ca08c6b6d64582e6d09b33d7d065a7349cc7fe61f2b20bad6d9436db5d736edd7fc673fc7982f8a22f48050a 0005-dump2tar-linking-order.patch +984fd24ff1bf2d77f6aca77e4a75334ad21a9e36ce27fabb848d82a8e68446e2effeb16a725d5b93ae178ac11379f83a003c8c0d9e408cf96419873741517c3e 0006-define-path-mounted.patch +61b58cd3763458fb2f8c58ec410398e807711734154843cc96cfcc3857757ec6374dd2c22cd5ef5dec1d30c2e8a4dd0c4064f36824e8734a8625fc58668faeb8 0007-tunedasd-no-need-error-h.patch +1ec287c4d5c5c3336adacd658640afe5538fd91b86b87d2d0b5f96118a27527b4cf2318ce4712d6c94aceafacf2691a937ddc3ea6e1ecde9e41419c6c72a7471 0008-iucvterm-no-nls.patch +6e17741908c34b12c24d806712e8033de742592dea0583c9d10955b8003729da8cbd4f5095b6fbd7788d7f1eedeafdcf5a2077f1908e28a4ddd7b34368aacd34 0009-zdev-libexecinfo.patch +2d5cd3709e0233a6b97270af687b89bbc55f208744437a8409fc38c6afc152a8ebbf60a3d0b837a7c01a36b9bbf5f69d376c89fafcbb8e4153b64a09dc49a23a 0010-musl-s390x-signal-def.patch +d879173250fc0cabef198785923248e6832158e38d6ea9ef615f14e2d6698810b54c38c8327f20b2c43d8d509a274b27a7c0ad999a0c0bed2743715f21ab859a 0100-zipl-no-pie.patch +1cbbe3fe265c7d4164143d24c532c18b354be4bc295ad24064d379660e43a475b7d678b458cdf74ffdb44d6cd38a497dbe00758d688c547c6ece63b6dee091b7 0101-zipl-dont-optimize-size.patch +4ce15b615ff08e5c0a23d3c3b19d1e9d6362239fb731e67fa68e6cd108cfdeaaf16186c5416cc211082aa60c4d1946b930b9ea4c300458da98e9a701feed99c3 0200-dasdinfo-gnu-ext-hack.patch +9ce268721f4648305b0fc81225c0f8b1dc4b0b79a11631d661b236bcee799accadd7581e60258d4c026e7d2e25fadcae0da69560e48e6c92e074308b9b49b5c2 0300-disable-program-using-gnu-ext.patch +a805dff7898f05cb2fb6059624bbe55ed5399fc82068bfa2c592245c0d09991eccc8664cc0325302f29e954edd2ff913e8131bb3c7114050667ad6466503e86d s390-tools-script" diff --git a/main/s390-tools/s390-tools-script b/main/s390-tools/s390-tools-script new file mode 100755 index 0000000000..d76a094162 --- /dev/null +++ b/main/s390-tools/s390-tools-script @@ -0,0 +1,58 @@ +#!/bin/sh + +[ "$#" -lt 1 ] && exit 0 + +# copied from alpine-conf/setup-disk.in +_blkid() { + blkid | grep "^$1:" +} +uuid_or_device() { + local i= + case "$1" in + /dev/md*) echo "$1" && return 0;; + esac + for i in $(_blkid "$1"); do + case "$i" in + UUID=*) eval $i;; + esac + done + if [ -n "$UUID" ]; then + echo "UUID=$UUID" + else + echo "$1" + fi +} +find_mount_dev() { + local mnt="$1" + awk "\$2 == \"$mnt\" { print \$1 }" /proc/mounts | tail -n 1 +} + +zipl_gen_conf() { + KERNEL_FLAVOR="-vanilla" + RAMDISK_FLAVOR="-vanilla" + + rootdev=$(find_mount_dev "/") + root_uuid=$(uuid_or_device $rootdev) + [ -n "$root_uuid" ] && root_parm="root=$root_uuid" + + cat > /etc/zipl.conf <<- EOF + [defaultboot] + defaultauto + prompt=1 + timeout=5 + default=linux + target=/boot + [linux] + image=/boot/vmlinuz$KERNEL_FLAVOR + ramdisk=/boot/initramfs$RAMDISK_FLAVOR + parameters="$root_parm rd.md=0 rd.dm=0 rd.luks=0 KEYTABLE=us LANG=en_US.UTF-8" + EOF +} + +zipl_run() { + zipl_gen_conf + /sbin/zipl --verbose +} + +"$1" + diff --git a/main/s390-tools/s390-tools.post-install b/main/s390-tools/s390-tools.post-install new file mode 100644 index 0000000000..5c42deb530 --- /dev/null +++ b/main/s390-tools/s390-tools.post-install @@ -0,0 +1,4 @@ +#!/bin/sh + +/sbin/s390-tools-script zipl_gen_conf + diff --git a/main/s390-tools/s390-tools.post-upgrade b/main/s390-tools/s390-tools.post-upgrade new file mode 120000 index 0000000000..a9652ff55c --- /dev/null +++ b/main/s390-tools/s390-tools.post-upgrade @@ -0,0 +1 @@ +s390-tools.post-install
\ No newline at end of file diff --git a/main/s390-tools/s390-tools.trigger b/main/s390-tools/s390-tools.trigger new file mode 100644 index 0000000000..44db447667 --- /dev/null +++ b/main/s390-tools/s390-tools.trigger @@ -0,0 +1,4 @@ +#!/bin/sh + +/sbin/s390-tools-script zipl_run + |