From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 7 Dec 2004 22:05:47 +0000
Subject: Merge oe-devel@oe-devel.bkbits.net:packages.bb into
 handhelds.org:/home/kergoth/code/packages.bb

2004/12/07 04:58:25-06:00 ti.com!kergoth
More updates per the core rename.

2004/12/07 04:46:51-06:00 ti.com!kergoth
Update soundtracker per the core rename.

2004/12/07 04:44:14-06:00 ti.com!kergoth
Merge

2004/12/07 04:42:38-06:00 ti.com!kergoth
Updates per the recent rename of the oe core from 'oe' to 'bitbake'.

BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw
---
 classes/rootfs_ipk.bbclass | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 classes/rootfs_ipk.bbclass

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From 63fad339e01d4b16105146c32a61f24460397126 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Sun, 2 Jan 2005 01:40:05 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/02 02:37:18+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/01/02 02:37:06+01:00 handhelds.org!CoreDump
rootfs_ipk: Check the logfile for error messages and error-out if necessary

2005/01/02 02:34:54+01:00 handhelds.org!CoreDump
opie-image: Fail gracefully if ipkg.conf is missing

BKrev: 41d750f5kYn8z0gnIKOxG2q7gzJaXw
---
 classes/rootfs_ipk.bbclass | 129 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index e69de29bb2..747f3ad62b 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -0,0 +1,129 @@
+#
+# Creates a root filesystem out of IPKs
+#
+# This rootfs can be mounted via root-nfs or it can be put into an cramfs/jffs etc.
+# See image_ipk.oeclass for a usage of this.
+#
+
+DEPENDS_prepend="ipkg-native ipkg-utils-native fakeroot-native "
+DEPENDS_append=" ${EXTRA_IMAGEDEPENDS}"
+
+PACKAGES = ""
+
+do_rootfs[nostamp] = 1
+do_rootfs[dirs] = ${TOPDIR}
+
+IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
+
+ROOTFS_POSTPROCESS_COMMAND ?= ""
+
+PID = "${@os.getpid()}"
+
+# some default locales
+IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
+
+LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
+
+real_do_rootfs () {
+	set -x
+		
+	mkdir -p ${IMAGE_ROOTFS}/dev
+
+	rm -f ${DEPLOY_DIR_IPK}/Packages
+	touch ${DEPLOY_DIR_IPK}/Packages
+	ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+	mkdir -p ${T}
+	echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
+	ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+	priority=1
+	for arch in $ipkgarchs; do
+		echo "arch $arch $priority" >> ${T}/ipkg.conf
+		priority=$(expr $priority + 5)
+	done
+	ipkg-cl ${IPKG_ARGS} update
+	if [ ! -z "${LINGUAS_INSTALL}" ]; then
+		ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
+		for i in ${LINGUAS_INSTALL}; do
+			ipkg-cl ${IPKG_ARGS} install $i
+		done
+	fi
+	if [ ! -z "${IPKG_INSTALL}" ]; then
+		ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL}
+	fi
+
+	export D=${IMAGE_ROOTFS}
+	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
+	mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/
+	grep "^arch" ${T}/ipkg.conf >${IMAGE_ROOTFS}/etc/ipkg/arch.conf
+
+	for i in ${IMAGE_ROOTFS}/usr/lib/ipkg/info/*.preinst; do
+		if [ -f $i ] && ! sh $i; then
+			ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
+		fi
+	done
+	for i in ${IMAGE_ROOTFS}/usr/lib/ipkg/info/*.postinst; do
+		if [ -f $i ] && ! sh $i configure; then
+			ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
+		fi
+	done
+
+	install -d ${IMAGE_ROOTFS}/${sysconfdir}
+	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
+
+	${ROOTFS_POSTPROCESS_COMMAND}
+	
+	log_check rootfs 	
+}
+
+log_check() {
+	set +x
+	for target in $*
+	do
+		lf_path="${WORKDIR}/temp/log.do_$target.${PID}"
+		
+		echo "log_check: Using $lf_path as logfile"
+		
+		if test -e "$lf_path"
+		then
+			lf_txt="`cat $lf_path`"
+			
+			for keyword_die in "Cannot find package" "exit 1" err fail
+			do				
+				
+				if (echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die") &>/dev/null
+				then
+					echo "log_check: There were error messages in the logfile"
+					echo -e "log_check: Matched keyword: [$keyword_die]\n"
+					echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die"
+					echo ""
+					do_exit=1				
+				fi
+			done
+			test "$do_exit" = 1 && exit 1						
+		else
+			echo "Cannot find logfile [$lf_path]"
+		fi
+		echo "Logfile is clean"		
+	done
+
+	set -x
+	
+}
+
+fakeroot do_rootfs () {
+	rm -rf ${IMAGE_ROOTFS}
+	real_do_rootfs
+}
+
+# set '*' as the rootpassword so the images
+# can decide if they want it or not
+
+zap_root_password () {
+	sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
+	mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd	
+} 
+
+# export the zap_root_password
+EXPORT_FUNCTIONS zap_root_password
+
+addtask rootfs before do_build after do_install
-- 
cgit v1.2.3


From 58e96e5d71da1193c88cd5392e91a55f0a37d21e Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Sun, 2 Jan 2005 18:40:07 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/02 19:29:51+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/01/02 19:29:40+01:00 handhelds.org!CoreDump
rootfs_ipk: compensate for libgpg-err0

BKrev: 41d84007WaVATCNNgdjuFwFiwkniRQ
---
 classes/rootfs_ipk.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 747f3ad62b..96e3321a60 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -87,10 +87,10 @@ log_check() {
 		then
 			lf_txt="`cat $lf_path`"
 			
-			for keyword_die in "Cannot find package" "exit 1" err fail
+			for keyword_die in "Cannot find package" "exit 1" ERR Fail
 			do				
 				
-				if (echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die") &>/dev/null
+				if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null
 				then
 					echo "log_check: There were error messages in the logfile"
 					echo -e "log_check: Matched keyword: [$keyword_die]\n"
-- 
cgit v1.2.3


From 80d622e0c1dbc284858e01d3eb670303a6d8cdf9 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 22 Jan 2005 23:35:35 +0000
Subject: make do_build nostamp for packages using image_rootfs.bbclass

BKrev: 41f2e347IXdl_kk4iVLjIHXcAJsUiQ
---
 classes/rootfs_ipk.bbclass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 96e3321a60..9897c1d901 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -12,6 +12,7 @@ PACKAGES = ""
 
 do_rootfs[nostamp] = 1
 do_rootfs[dirs] = ${TOPDIR}
+do_build[nostamp] = 1
 
 IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
 
-- 
cgit v1.2.3


From a702a4829935cbe81edef1de716bc81664f94e0a Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 24 Feb 2005 01:40:08 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 19:29:51-06:00 ti.com!kergoth
Rename gnupg-devel to gnupg2, since this development branch has the binaries
postfixed that way, so is clearly for the upcoming 2.x stable release.  Also
change libexecdir from /usr/libexec to /usr/libexec/gnupg2, as it was
resulting in the gnupg binaries ending up in the root of /usr/libexec, rather
than by packagename.

2005/02/23 19:24:52-06:00 ti.com!kergoth
Fix the ipk rootfs/image classes to use ${libdir}/ipkg, now that ipkg does so as well.

2005/02/23 19:22:38-06:00 ti.com!kergoth
Add a development version of gnupg (version 1.9.15) as gnupg-devel.
Note that the 'gpgsm' and 'scdaemon' binaries are not currently being
built, due to the additional dependencies they introduce.  If you need
them, let me know.
One issue that needs to be fixed is that the gnupg-devel build needs to
prefix or postfix its binaries, or conflict with 'gnupg', to ensure
they don't step on one another's toes.

2005/02/23 19:18:34-06:00 ti.com!kergoth
Add libgpg-error 1.0 (required by gnupg 0.9.15) and make the libgpg-error .bb's inherit binconfig.

2005/02/23 19:17:35-06:00 ti.com!kergoth
Add libgcrypt 1.2.1 and make the libgcrypt .bb's inherit binconfig.

2005/02/23 19:16:20-06:00 ti.com!kergoth
Add libassuan 0.6.9 (required by gnupg 0.9.15) and make the libassuan .bb's inherit binconfig.

BKrev: 421d3078taXhU4QcW7mi0rDTzgYsgA
---
 classes/rootfs_ipk.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 9897c1d901..e42704b5ae 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -57,12 +57,12 @@ real_do_rootfs () {
 	mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/
 	grep "^arch" ${T}/ipkg.conf >${IMAGE_ROOTFS}/etc/ipkg/arch.conf
 
-	for i in ${IMAGE_ROOTFS}/usr/lib/ipkg/info/*.preinst; do
+	for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.preinst; do
 		if [ -f $i ] && ! sh $i; then
 			ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
 		fi
 	done
-	for i in ${IMAGE_ROOTFS}/usr/lib/ipkg/info/*.postinst; do
+	for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.postinst; do
 		if [ -f $i ] && ! sh $i configure; then
 			ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
 		fi
-- 
cgit v1.2.3


From ad50b0674f6db015354de3eb26f406678c25b8a4 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Thu, 31 Mar 2005 09:41:38 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/31 11:28:44+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/31 01:34:08+02:00 uni-frankfurt.de!mickeyl
apply the fix-nomax patch for Opie's libqpe from 1.2.0. It will land upstream, so it's not necessary to apply it on the cvs version

2005/03/31 01:32:37+02:00 uni-frankfurt.de!mickeyl
put an end to the datetime problem on handhelds. if /etc/timestamp exists, it will be used to regenerate the time at bootup (see /etc/init.d/bootmisc.sh) and it will be freshened at halt (see /etc/init.d/halt) as well as on reboot (see /etc/init.d/reboot). Since we are still testing this, for now only in opie-image and for openzaurus distros. If that works out well, we should use it everywhere

2005/03/30 23:49:33+02:00 uni-frankfurt.de!mickeyl
set Opie OTabWidget TabStyle to using text labels on hires displays - until we have hires tab icons and a sane tab height

BKrev: 424bc5d2IBEsVN01WaE-JgWrsqwt2Q
---
 classes/rootfs_ipk.bbclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index e42704b5ae..7ed8342b1e 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -124,7 +124,11 @@ zap_root_password () {
 	mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd	
 } 
 
-# export the zap_root_password
-EXPORT_FUNCTIONS zap_root_password
+create_etc_timestamp() {
+	date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp
+}
+
+# export the zap_root_password and create_etc_timestamp
+EXPORT_FUNCTIONS zap_root_password create_etc_timestamp
 
 addtask rootfs before do_build after do_install
-- 
cgit v1.2.3


From 30224312da542b11730e13c15c051a574ab49c84 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Wed, 15 Jun 2005 14:15:01 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into 
 marsco.kalmiopsis:/home/nslu2/openembedded

2005/06/15 12:55:22+02:00 utwente.nl!koen
sapwood_1.20-1.bb:  extra install_append, courtesy Florian Boor
osso-gnome-vfs2_2.8.4.4-1.bb:  adjust depends, courtesy Florian Boor
Many files:  added, courtesy Florian Boor
hildon-libs_0.9.6-2.bb:  adjust staging, courtesy Florian Boor

2005/06/15 12:18:24+02:00 uni-frankfurt.de!mickeyl
add mathomatic, a small, portable, general purpose CAS. Patch courtesy Simon Pickering

2005/06/15 11:58:18+02:00 utwente.nl!koen
Many meamo files:  source -> ., courtesy Florian Boor
Add gconf-osso, part of the maemo.org suite, courtesy Florian Boor

2005/06/15 11:45:40+02:00 utwente.nl!koen
base-files_3.0.14.bb:  support nokia770, courtesy Florian Boor

2005/06/15 11:05:24+02:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/06/15 11:05:02+02:00 handhelds.org!CoreDump
altboot: Add a timeout on boot and only show the menu when requested

2005/06/15 10:29:53+02:00 mn-solutions.de!schurig
assorted MNCI / RT3000 changes

2005/06/15 10:27:59+02:00 mn-solutions.de!schurig
classes/rootfs_ipk.bbclass:
allows to keep the Packages file
(my own python script to create Packages is way faster :-)

2005/06/14 22:59:08+01:00 reciva.com!pb
use mkdir -p, not install -d

2005/06/14 22:02:28+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/06/14 22:02:15+02:00 utwente.nl!koen
xmame_0.95.bb:
  remove UNNECESSARY and BOGUS qpe crap. Can we please stop committing such nonsonse? virtual/libsdl exists for a reason

2005/06/14 21:01:19+01:00 reciva.com!pb
apply PARALLEL_INSTALL_MODULES patch from Erik Hovland


2005/06/14 20:55:08+01:00 reciva.com!pb
update xmame to 0.95, courtesy Erik Hovland


2005/06/14 20:52:19+01:00 reciva.com!pb
update handhelds-pxa kernel to hh40, courtesy Erik Hovland


2005/06/14 19:10:13+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/06/14 19:00:35+02:00 uni-frankfurt.de!mickeyl
Add tslib config files for omap5912osk. Patch courtesy philip@balister.org

2005/06/14 18:59:02+02:00 uni-frankfurt.de!mickeyl
Fix Typo in xerces-c. Patch courtesy philip@balister.org

2005/06/14 13:45:03+02:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into marcinj.local:/home/hrw/zaurus/oe/openembedded

2005/06/14 13:44:34+02:00 local!hrw
updated kdepimpi to 2.1.5

2005/06/14 13:16:38+02:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/06/14 13:16:14+02:00 handhelds.org!CoreDump
altboot: Update to latest version

2005/06/14 13:13:37+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/06/14 13:13:23+02:00 utwente.nl!koen
Add tune-supersparc.conf for people who have v8 cpu's and want hardware integer multiply and divide. Makes ssh login approx. 30 times faster

2005/06/14 11:55:00+01:00 reciva.com!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mill.internal.reciva.com:/nexus/home/pb/oe/oe

2005/06/14 11:52:01+01:00 reciva.com!pb
eliminate spare copy of sun4cdm kernel preference


2005/06/14 12:43:33+02:00 mn-solutions.de!schurig
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into mnz66.mn-solutions.de:/usr/src/mnci54/oe

2005/06/14 12:43:12+02:00 mn-solutions.de!schurig
renamed MACHINE 'ramses' to 'mnci'
added new MACHINE 'rt3000'

renamed DISTRO 'openmnci' to 'openmn', which now is for both MNCI and RT3000

2005/06/14 09:52:19+02:00 mn-solutions.de!schurig
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into mnz66.mn-solutions.de:/usr/src/mnci54/oe

2005/06/10 09:37:26+02:00 mn-solutions.de!schurig
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into mnz66.mn-solutions.de:/usr/src/mnci54/oe

2005/06/08 10:05:02+02:00 mn-solutions.de!schurig
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into mnz66.mn-solutions.de:/usr/src/mnci54/oe

2005/06/08 09:16:06+02:00 mn-solutions.de!schurig
icewm: use sourceforge mirror

BKrev: 42b037e5CrddHepCs3gW5YAsfOQ7ng
---
 classes/rootfs_ipk.bbclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 7ed8342b1e..540d8404f0 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -30,9 +30,11 @@ real_do_rootfs () {
 		
 	mkdir -p ${IMAGE_ROOTFS}/dev
 
-	rm -f ${DEPLOY_DIR_IPK}/Packages
-	touch ${DEPLOY_DIR_IPK}/Packages
-	ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+	if -z "${DEPLOY_KEEP_PACKAGES}"; then
+		rm -f ${DEPLOY_DIR_IPK}/Packages
+		touch ${DEPLOY_DIR_IPK}/Packages
+		ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+	fi
 	mkdir -p ${T}
 	echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
 	ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
-- 
cgit v1.2.3


From 56d8f000eff4861a2f04a42e5abc12bd48ac6039 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Wed, 15 Jun 2005 21:40:10 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into 
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/15 23:25:59+02:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded

2005/06/15 23:23:46+02:00 handhelds.org!zecke
qmake 2.00a update:
    -Use the most recent version of qmake as found in Qt/X11 4rc1
    -Update the oe-qmake.conf

2005/06/15 23:18:07+02:00 opfer.lan!dirk
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into wks-dirk.opfer.lan:/prj/zaurus/dev/openembedded

2005/06/15 23:16:28+02:00 opfer.lan!dirk
TOSA: update touchscreen. autoload touchscreen and sound modules on startup

2005/06/15 21:58:37+01:00 rpsys.net!RP
oprofile: update cvs version - some arm patches merged

2005/06/15 21:57:10+01:00 rpsys.net!RP
rootfs_ipk: Make the shell script valid

2005/06/15 22:38:57+02:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded

2005/06/15 22:37:17+02:00 handhelds.org!zecke
Qt4 uic/moc:
    -Use Qt/X11 4.0.0rc1 as the Embedded version is missing
    -Update patch and configuration options to 4.0.0rc1 and
     X11

BKrev: 42b0a03azEk5o8agXTo43EgKiE5_xg
---
 classes/rootfs_ipk.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 540d8404f0..062c957359 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -30,7 +30,7 @@ real_do_rootfs () {
 		
 	mkdir -p ${IMAGE_ROOTFS}/dev
 
-	if -z "${DEPLOY_KEEP_PACKAGES}"; then
+	if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
 		rm -f ${DEPLOY_DIR_IPK}/Packages
 		touch ${DEPLOY_DIR_IPK}/Packages
 		ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
-- 
cgit v1.2.3


From b5067af0bfa30f894bc4fed805aaee5f5c529b2b Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 27 Sep 2005 21:35:38 +0000
Subject: rootfs_ipk: Add a remove_init_link function to the rootfs_ipk
 oeclass. This is needed for the nokia770 which won't boot with /sbin/init as
 a symbolic link (and I'm told other machines have this problem).

---
 classes/rootfs_ipk.bbclass | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 062c957359..2880411c31 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -130,7 +130,16 @@ create_etc_timestamp() {
 	date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp
 }
 
-# export the zap_root_password and create_etc_timestamp
-EXPORT_FUNCTIONS zap_root_password create_etc_timestamp
+# Turn any symbolic /sbin/init link into a file
+remove_init_link () {
+	if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then
+		LINKFILE=${IMAGE_ROOTFS}`readlink ${IMAGE_ROOTFS}/sbin/init`
+		rm ${IMAGE_ROOTFS}/sbin/init
+		cp $LINKFILE ${IMAGE_ROOTFS}/sbin/init
+	fi
+}
+
+# export the zap_root_password, create_etc_timestamp and remote_init_link
+EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link
 
 addtask rootfs before do_build after do_install
-- 
cgit v1.2.3