webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Jan Paul Tuecking
2010-07-26 19:19:11 +02:00
parent 3ed577a541 b6de67684f
commit 09e756f8f2
18 changed files with 282 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lfs/compat-wireless
View File

@@ -30,7 +30,7 @@ else
VERSUFIX=ipfire
endif
VER = 2.6.34
VER = 2.6.34.1
THISAPP = compat-wireless-$(VER)
DL_FILE = compat-wireless-$(VER).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 951e15df527eb89f3c9deb752c709fb3
$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6
install : $(TARGET)

7
lfs/cpio
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.6
VER = 2.11
THISAPP = cpio-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 76b4145f33df088a5bade3bf4373d17d
$(DL_FILE)_MD5 = 1112bb6c45863468b5496ba128792f6c
install : $(TARGET)
@@ -70,12 +70,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i "s/invalid_arg/argmatch_invalid/" src/mt.c
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fixes-1.patch
cd $(DIR_APP) && ./configure CPIO_MT_PROG=mt --prefix=/usr \
--bindir=/bin --libexecdir=/tmp \
--with-rmt=/usr/sbin/rmt
cd $(DIR_APP) && echo "#define HAVE_LSTAT 1" >> config.h
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

9
lfs/initrd
View File

@@ -89,8 +89,13 @@ $(TARGET) :
# Remove binary depmod files
rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/modules.*.bin
mksquashfs /install/initrd /install/images/initrd
cd /install/initrd && strip --strip-all {,usr/}{,s}bin/* || true
cd /install/initrd && strip --strip-debug {,usr/}lib/* || true
cd /install/initrd && ln -svf sbin/init init
cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
@$(POSTBUILD)

4
lfs/mkinitcpio
View File

@@ -73,8 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./install.sh ""
cp $(DIR_SRC)/config/mkinitcpio/virtio /lib/initcpio/install/
sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf
sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ehci_hcd"|g' /etc/mkinitcpio.conf
sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio"|g' /etc/mkinitcpio.conf
sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ext2 ehci_hcd sd_mod"|g' /etc/mkinitcpio.conf
sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide
sed -i 's| gzip -9 | lzma |g' /sbin/mkinitcpio
@rm -rf $(DIR_APP)