Commit 0a9fc7d7 authored by Eric Andersen's avatar Eric Andersen
Browse files

Update genext2fs for filesystems greater than 8 MB. 

 -Erik
parent cb8292f0

make/ext2root.mk

+4 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# genext2fs to build to target ext2 filesystems

#

#############################################################

GENEXT2_DIR=$(BUILD_DIR)/genext2fs-1.3.orig

GENEXT2_DIR=$(BUILD_DIR)/genext2fs-1.3

GENEXT2_SOURCE=genext2fs_1.3.orig.tar.gz

GENEXT2_SITE=http://ftp.debian.org/debian/pool/main/g/genext2fs

GENEXT2_PATCH=$(SOURCE_DIR)/genext2fs.patch
@@ -13,6 +13,7 @@ $(DL_DIR)/$(GENEXT2_SOURCE): 


$(GENEXT2_DIR): $(DL_DIR)/$(GENEXT2_SOURCE) $(GENEXT2_PATCH)

	zcat $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf -

	mv $(GENEXT2_DIR).orig $(GENEXT2_DIR)

	cat $(GENEXT2_PATCH) | patch -p1 -d $(GENEXT2_DIR)



$(GENEXT2_DIR)/genext2fs: $(GENEXT2_DIR)
@@ -37,7 +38,7 @@ genext2fs: $(GENEXT2_DIR)/genext2fs 


# how much KB we want to add to the calculated size for the root directory,

# to have additional space

GENEXT2_ADDTOROOTSIZE := 256

GENEXT2_ADDTOROOTSIZE := 512

# maximal rootfilesystem size that can be handled

# by genext2fs

GENEXT2_MAXROOTSIZE := 8192
@@ -55,7 +56,7 @@ ext2root: genext2fs 
	-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true;

	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;

	$(GENEXT2_DIR)/genext2fs -i $(GENEXT2_INODES) -b $(GENEXT2_SIZE) \

		-d $(TARGET_DIR) -D $(SOURCE_DIR)/device_table.txt $(IMAGE)

		-d $(TARGET_DIR) -q -D $(SOURCE_DIR)/device_table.txt $(IMAGE)



ext2root-source: $(DL_DIR)/$(GENEXT2_SOURCE)

sources/device_table.txt

+89 −59
Original line number Diff line number Diff line 
# device list table

# When building a target filesystem, it is desirable to not have to

# become root and then run 'mknod' a thousand times.  Using a device 

# table you can create device nodes and directories "on the fly".

#

# This is a sample device table file for use with genext2fs.  You can

# do all sorts of interesting things with a device table file.  For

# example, if you want to adjust the permissions on a particular file

# you can just add an entry like:

#   /sbin/foobar        f       2755    0       0       -       -       -       -       -

# and (assuming the file /sbin/foobar exists) it will be made setuid

# root (regardless of what its permissions are on the host filesystem.

# Furthermore, you can use a single table entry to create a many device

# minors.  For example, if I wanted to create /dev/hda and /dev/hda[0-15]

# I could just use the following two table entries:

#   /dev/hda    b       640     0       0       3       0       0       0       -

#   /dev/hda    b       640     0       0       3       1       1       1       15

# 

# Device table entries take the form of:

# <name>    <type>      <mode>  <uid>   <gid>   <major> <minor> <start> <inc>   <count>

/etc		d	755	0	0	-	-	-	-	-

# where name is the file name,  type can be one of: 

#       f       A regular file

#       d       Directory

#       c       Character special device file

#       b       Block special device file

#       p       Fifo (named pipe)

# uid is the user id for the target file, gid is the group id for the

# target file.  The rest of the entries (major, minor, etc) apply only 

# to device special files.



# Have fun

# -Erik Andersen <andersen@codepoet.org>

#



#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>

/dev		d	755	0	0	-	-	-	-	-

/dev		d	755	0	0	-	-	-	-	-

/dev/pts	d	755	0	0	-	-	-	-	-

/tmp		d	1777	0	0	-	-	-	-	-



# Fixme -- add support for type 'f'

#/bin/tinylogin	f	4755	0	0	-	-	-	-	-

#/etc/shadow	f	600	0	0	-	-	-	-	-

#/etc/shadow	f	600	0	0	-	-	-	-	-



# Normal stuff

/etc		d	755	0	0	-	-	-	-	-

/dev/mem	c	640	0	0	1	1	0	0	-

/dev/kmem	c	640	0	0	1	2	0	0	-

/dev/null	c	640	0	0	1	3	0	0	-
@@ -24,69 +50,72 @@ 
/dev/ram	b	640	0	0	1	0	0	1	4

/dev/loop	b	640	0	0	7	0	0	1	2

/dev/ptmx	c	666	0	0	5	2	0	0	-

#/dev/ttyS	c	640	0	0	4	64	0	1	4

#/dev/psaux	c	640	0	0	10	1	0	0	-

/dev/ttyS	c	640	0	0	4	64	0	1	4

/dev/psaux	c	640	0	0	10	1	0	0	-

#/dev/rtc	c	640	0	0	10	135	0	0	-

#/dev/fd		b	640	0	0	2	0	0	1	2

#/dev/fd0d360	b	640	0	0	2	4	0	0	-

#/dev/fd1d360	b	640	0	0	2	5	0	0	-

#/dev/fd0h1200	b	640	0	0	2	8	0	0	-

#/dev/fd1h1200	b	640	0	0	2	9	0	0	-

#/dev/fd0u1440	b	640	0	0	2	28	0	0	-

#/dev/fd1u1440	b	640	0	0	2	29	0	0	-

#/dev/fd0u2880	b	640	0	0	2	32	0	0	-

#/dev/fd1u2880	b	640	0	0	2	33	0	0	-

#



# Adjust permissions on some normal files

/etc/shadow	f	600	0	0	-	-	-	-	-

/bin/tinylogin	f	4755	0	0	-	-	-	-	-



# User-mode Linux stuff

/dev/ubda	b	640	0	0	98	0	0	0	-

/dev/ubda	b	640	0	0	98	1	1	1	15

#

# Raid device directories

/dev/cciss	d	755	0	0	-	-	-	-	-

/dev/ida	d	755	0	0	-	-	-	-	-

/dev/rd		d	755	0	0	-	-	-	-	-

#



# IDE Devices

/dev/hda	b	640	0	0	3	0	0	0	-

/dev/hda	b	640	0	0	3	1	1	1	15

/dev/hdb	b	640	0	0	3	64	0	0	-

/dev/hdb	b	640	0	0	3	65	1	1	15

/dev/hdc	b	640	0	0	22	0	0	0	-

/dev/hdc	b	640	0	0	22	1	1	1	15

/dev/hdd	b	640	0	0	22	64	0	0	-

/dev/hdd	b	640	0	0	22	65	1	1	15

/dev/hde	b	640	0	0	33	0	0	0	-

/dev/hde	b	640	0	0	33	1	1	1	15

/dev/hdf	b	640	0	0	33	64	0	0	-

/dev/hdf	b	640	0	0	33	65	1	1	15

/dev/hdg	b	640	0	0	34	0	0	0	-

/dev/hdg	b	640	0	0	34	1	1	1	15

/dev/hdh	b	640	0	0	34	64	0	0	-

/dev/hdh	b	640	0	0	34	65	1	1	15

#/dev/hdc	b	640	0	0	22	0	0	0	-

#/dev/hdc	b	640	0	0	22	1	1	1	15

#/dev/hdd	b	640	0	0	22	64	0	0	-

#/dev/hdd	b	640	0	0	22	65	1	1	15

#/dev/hde	b	640	0	0	33	0	0	0	-

#/dev/hde	b	640	0	0	33	1	1	1	15

#/dev/hdf	b	640	0	0	33	64	0	0	-

#/dev/hdf	b	640	0	0	33	65	1	1	15

#/dev/hdg	b	640	0	0	34	0	0	0	-

#/dev/hdg	b	640	0	0	34	1	1	1	15

#/dev/hdh	b	640	0	0	34	64	0	0	-

#/dev/hdh	b	640	0	0	34	65	1	1	15



# SCSI Devices

/dev/sda	b	640	0	0	8	0	0	0	-

/dev/sda	b	640	0	0	8	1	1	1	15

/dev/sdb	b	640	0	0	8	16	0	0	-

/dev/sdb	b	640	0	0	8	17	1	1	15

/dev/sdc	b	640	0	0	8	32	0	0	-

/dev/sdc	b	640	0	0	8	33	1	1	15

/dev/sdd	b	640	0	0	8	48	0	0	-

/dev/sdd	b	640	0	0	8	49	1	1	15

/dev/sde	b	640	0	0	8	64	0	0	-

/dev/sde	b	640	0	0	8	65	1	1	15

/dev/sdf	b	640	0	0	8	80	0	0	-

/dev/sdf	b	640	0	0	8	81	1	1	15

/dev/sdg	b	640	0	0	8	96	0	0	-

/dev/sdg	b	640	0	0	8	97	1	1	15

/dev/sdh	b	640	0	0	8	112	0	0	-

/dev/sdh	b	640	0	0	8	113	1	1	15

/dev/sg		c	640	0	0	21	0	0	1	15

/dev/scd	b	640	0	0	11	0	0	1	15

/dev/st		c	640	0	0	9	0	0	1	8

/dev/nst	c	640	0	0	9	128	0	1	8

#/dev/sda	b	640	0	0	8	0	0	0	-

#/dev/sda	b	640	0	0	8	1	1	1	15

#/dev/sdb	b	640	0	0	8	16	0	0	-

#/dev/sdb	b	640	0	0	8	17	1	1	15

#/dev/sdc	b	640	0	0	8	32	0	0	-

#/dev/sdc	b	640	0	0	8	33	1	1	15

#/dev/sdd	b	640	0	0	8	48	0	0	-

#/dev/sdd	b	640	0	0	8	49	1	1	15

#/dev/sde	b	640	0	0	8	64	0	0	-

#/dev/sde	b	640	0	0	8	65	1	1	15

#/dev/sdf	b	640	0	0	8	80	0	0	-

#/dev/sdf	b	640	0	0	8	81	1	1	15

#/dev/sdg	b	640	0	0	8	96	0	0	-

#/dev/sdg	b	640	0	0	8	97	1	1	15

#/dev/sdh	b	640	0	0	8	112	0	0	-

#/dev/sdh	b	640	0	0	8	113	1	1	15

#/dev/sg	c	640	0	0	21	0	0	1	15

#/dev/scd	b	640	0	0	11	0	0	1	15

#/dev/st	c	640	0	0	9	0	0	1	8

#/dev/nst	c	640	0	0	9	128	0	1	8

#/dev/st	c	640	0	0	9	32	1	1	4

#/dev/st	c	640	0	0	9	64	1	1	4

#/dev/st	c	640	0	0	9	96	1	1	4



# Floppy disk devices

#/dev/fd	b	640	0	0	2	0	0	1	2

#/dev/fd0d360	b	640	0	0	2	4	0	0	-

#/dev/fd1d360	b	640	0	0	2	5	0	0	-

#/dev/fd0h1200	b	640	0	0	2	8	0	0	-

#/dev/fd1h1200	b	640	0	0	2	9	0	0	-

#/dev/fd0u1440	b	640	0	0	2	28	0	0	-

#/dev/fd1u1440	b	640	0	0	2	29	0	0	-

#/dev/fd0u2880	b	640	0	0	2	32	0	0	-

#/dev/fd1u2880	b	640	0	0	2	33	0	0	-



# All the proprietary cdrom devices in the world

#/dev/aztcd	b	640	0	0	29	0	0	0	-

#/dev/bpcd	b	640	0	0	41	0	0	0	-
@@ -101,3 +130,4 @@ 
#/dev/sbpcd	b	640	0	0	25	0	0	1	4

#/dev/mcd	b	640	0	0	23	0	0	0	-

#/dev/optcd	b	640	0	0	17	0	0	0	-

sources/genext2fs.patch

+1855 −215

File changed.

Preview size limit exceeded, changes collapsed.