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

ARM: Fix packaging of xen-image and packages.

Browse Source
This commit is contained in:
Michael Tremer
2011-09-22 16:00:49 +02:00
parent 7aa0e5926a
commit 5596077b8d
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lfs/Config
View File

@@ -191,7 +191,12 @@ define PAK
cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
/install/packages/package; \
fi
cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
for i in $(DIR_SRC)/config/rootfiles/packages/{$(MACHINE),}/$(PROG); do \
if [ -e "$${i}" ]; then \
cp -v $${i} /install/packages/package/ROOTFILES; \
break; \
fi; \
done
sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(MACHINE)/g' -i /install/packages/package/ROOTFILES
sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
chmod 755 /install/packages/package/{{,un}install,update}.sh

7
make.sh
View File

@@ -790,7 +790,7 @@ buildpackages() {
ipfirepackages
# Check if there is a loop device for building in virtual environments
if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
ipfiremake xen-image ED=$IPFVER
@@ -827,7 +827,10 @@ buildpackages() {
ipfirepackages() {
ipfiremake core-updates
for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
local i
for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do
i=$(basename ${i})
if [ -e $BASEDIR/lfs/$i ]; then
ipfiredist $i
else