jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-10 03:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

- bump version. Closes #1225

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2007-03-20 16:42:51 +00:00
parent e3ea4c5cda
commit 0e59ed0208
5 changed files with 43 additions and 9730 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/ext2/ext2root.mk
View File

@ -3,16 +3,16 @@
# genext2fs to build to target ext2 filesystems # genext2fs to build to target ext2 filesystems
# #
############################################################# #############################################################
GENEXT2_DIR=$(BUILD_DIR)/genext2fs-1.3 GENEXT2_VERSION=1.4
GENEXT2_SOURCE=genext2fs_1.3.orig.tar.gz GENEXT2_DIR=$(BUILD_DIR)/genext2fs-$(GENEXT2_VERSION)
GENEXT2_SITE=http://ftp.debian.org/debian/pool/main/g/genext2fs GENEXT2_SOURCE=genext2fs-$(GENEXT2_VERSION).tar.gz
GENEXT2_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
$(DL_DIR)/$(GENEXT2_SOURCE): $(DL_DIR)/$(GENEXT2_SOURCE):
$(WGET) -P $(DL_DIR) $(GENEXT2_SITE)/$(GENEXT2_SOURCE) $(WGET) -P $(DL_DIR) $(GENEXT2_SITE)/$(GENEXT2_SOURCE)
$(GENEXT2_DIR)/.unpacked: $(DL_DIR)/$(GENEXT2_SOURCE) $(GENEXT2_DIR)/.unpacked: $(DL_DIR)/$(GENEXT2_SOURCE)
$(ZCAT) $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf - $(ZCAT) $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
mv $(GENEXT2_DIR).orig $(GENEXT2_DIR)
toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs\*.patch toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs\*.patch
touch $(GENEXT2_DIR)/.unpacked touch $(GENEXT2_DIR)/.unpacked
@ -51,11 +51,11 @@ EXT2_OPTS += -b $(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS))
endif endif
ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0) ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0)
EXT2_OPTS += -i $(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)) EXT2_OPTS += -N $(strip $(BR2_TARGET_ROOTFS_EXT2_INODES))
endif endif
ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),) ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),)
EXT2_OPTS += -r $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)) EXT2_OPTS += -m $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS))
endif endif
EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT)) EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT))
@ -104,14 +104,14 @@ ifneq ($(TARGET_DEVICE_TABLE),)
endif endif
# Use fakeroot so genext2fs believes the previous fakery # Use fakeroot so genext2fs believes the previous fakery
ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
GENEXT2_REALSIZE=`LC_ALL=C du -l -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \ GENEXT2_REALSIZE=`LC_ALL=C du -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \
GENEXT2_ADDTOROOTSIZE=`if [ $$GENEXT2_REALSIZE -ge 20000 ] ; then echo 16384; else echo 2400; fi`; \ GENEXT2_ADDTOROOTSIZE=`if [ $$GENEXT2_REALSIZE -ge 20000 ] ; then echo 16384; else echo 2400; fi`; \
GENEXT2_SIZE=`expr $$GENEXT2_REALSIZE + $$GENEXT2_ADDTOROOTSIZE`; \ GENEXT2_SIZE=`expr $$GENEXT2_REALSIZE + $$GENEXT2_ADDTOROOTSIZE`; \
GENEXT2_ADDTOINODESIZE=`find $(TARGET_DIR) | wc -l`; \ GENEXT2_ADDTOINODESIZE=`find $(TARGET_DIR) | wc -l`; \
GENEXT2_INODES=`expr $$GENEXT2_ADDTOINODESIZE + 400`; \ GENEXT2_INODES=`expr $$GENEXT2_ADDTOINODESIZE + 400`; \
set -x; \ set -x; \
echo "$(GENEXT2_DIR)/genext2fs -b $$GENEXT2_SIZE " \ echo "$(GENEXT2_DIR)/genext2fs -b $$GENEXT2_SIZE " \
"-i $$GENEXT2_INODES -d $(TARGET_DIR) " \ "-N $$GENEXT2_INODES -d $(TARGET_DIR) " \
"$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) "$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
else else
echo "$(GENEXT2_DIR)/genext2fs -d $(TARGET_DIR) " \ echo "$(GENEXT2_DIR)/genext2fs -d $(TARGET_DIR) " \

9709
target/ext2/genext2fs-01-cvs-updates.patch
View File

File diff suppressed because it is too large Load Diff

13
target/ext2/genext2fs-02-nosquash_devtable.patch
View File

@ -1,13 +0,0 @@
--- genext2fs-1.3/genext2fs.c~ 2005-02-15 02:21:18.000000000 -0700
+++ genext2fs-1.3/genext2fs.c 2005-02-15 02:17:09.000000000 -0700
@@ -1322,10 +1324,6 @@
}
else
{
- if(squash_uids)
- uid = gid = 0;
- if(squash_perms)
- mode &= ~(FM_IRWXG | FM_IRWXO);
mode &= FM_IMASK;
path2 = strdup(path);
name = basename(path);

14
target/ext2/genext2fs-1.4-nosquash.patch Normal file
View File

@ -0,0 +1,14 @@
diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-nosquash/genext2fs.c
--- genext2fs-1.4/genext2fs.c 2006-12-19 17:45:31.000000000 +0100
+++ genext2fs-1.4-nosquash/genext2fs.c 2007-02-09 10:47:05.000000000 +0100
@@ -1629,10 +1629,6 @@
mtime = st.st_mtime;
name = dent->d_name;
mode = get_mode(&st);
- if(squash_uids)
- uid = gid = 0;
- if(squash_perms)
- mode &= ~(FM_IRWXG | FM_IRWXO);
if(stats)
switch(st.st_mode & S_IFMT)
{

21
target/ext2/genext2fs-1.4-remove_ugly_warnings.patch Normal file
View File

@ -0,0 +1,21 @@
diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-remove_ugly_warnings/genext2fs.c
--- genext2fs-1.4/genext2fs.c 2007-02-09 10:54:56.000000000 +0100
+++ genext2fs-1.4-remove_ugly_warnings/genext2fs.c 2007-02-09 10:54:30.000000000 +0100
@@ -1606,7 +1606,7 @@
static void
add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_perms, uint32 fs_timestamp, struct stats *stats)
{
- uint32 nod;
+ uint32 nod = 0;
uint32 uid, gid, mode, ctime, mtime;
const char *name;
FILE *fh;
@@ -2056,7 +2056,7 @@
static filesystem *
load_fs(FILE * fh, int swapit)
{
- size_t fssize;
+ size_t fssize = 0;
filesystem *fs;
if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1))
perror_msg_and_die("input filesystem image");