diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-09-05 20:16:31 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-09-05 20:16:31 +0000 |
| commit | bda11d14f5beb30bc9f0d8303646297f8f3e65f2 (patch) | |
| tree | 8cc9c0600f8e3d70f5f9796616f9d72572bd0bc7 | |
| parent | f531b00978588b908d569abc4c977b69923e6b7c (diff) | |
| parent | 1b0ec1eeed007033b51b2933905bfb7aa335c2c2 (diff) | |
merge of 2b9450c3581604419a5aecf3261b55f4f47ea6d1
and 42be14012b6790df46c62295f3a02286acecbd4f
| -rw-r--r-- | classes/base.bbclass | 12 | ||||
| -rw-r--r-- | packages/fuse/fuse-module_2.4.2.bb | 33 | ||||
| -rw-r--r-- | packages/fuse/fuse-module_2.5.3.bb | 4 | ||||
| -rw-r--r-- | packages/fuse/fuse_2.4.2.bb | 23 | ||||
| -rw-r--r-- | packages/fuse/fuse_2.5.3.bb | 4 | ||||
| -rw-r--r-- | packages/gpe-buttonbox/gpe-buttonbox_0.5.bb | 2 | ||||
| -rw-r--r-- | packages/gpe-buttonbox/gpe-buttonbox_cvs.bb | 2 |
7 files changed, 19 insertions, 61 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 51b6d2111f..80e0b82198 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -324,6 +324,16 @@ python base_do_clean() { os.system('rm -f '+ dir) } +addtask rebuild +do_rebuild[dirs] = "${TOPDIR}" +do_rebuild[nostamp] = "1" +do_rebuild[bbdepcmd] = "" +python base_do_rebuild() { + """rebuild a package""" + bb.build.exec_task('do_clean', d) + bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d) +} + addtask mrproper do_mrproper[dirs] = "${TOPDIR}" do_mrproper[nostamp] = "1" @@ -685,7 +695,7 @@ python () { # Patch handling inherit patch -EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage +EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild MIRRORS[func] = "0" MIRRORS () { diff --git a/packages/fuse/fuse-module_2.4.2.bb b/packages/fuse/fuse-module_2.4.2.bb deleted file mode 100644 index 512f0453a1..0000000000 --- a/packages/fuse/fuse-module_2.4.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -HOMEPAGE = "http://fuse.sf.net" -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" - -LICENSE = "GPL" - - -DEPENDS = "fakeroot-native" -RRECOMMEND = "fuse" - -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" -S = "${WORKDIR}/fuse-${PV}" - -inherit autotools pkgconfig module -EXTRA_OECONF = " --with-kernel=${STAGING_KERNEL_DIR}" - -do_configure() { -cd ${S} ; oe_runconf -} - -do_compile(){ -LDFLAGS="" -cd ${S}/kernel -oe_runmake -} - -fakeroot do_install() { -LDFLAGS="" -cd ${S}/kernel -oe_runmake install DESTDIR=${D} -} - -FILES_${PN} = "/dev /lib/modules" diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb index 94cd87c603..0b887ba4bc 100644 --- a/packages/fuse/fuse-module_2.5.3.bb +++ b/packages/fuse/fuse-module_2.5.3.bb @@ -6,7 +6,9 @@ LICENSE = "GPL" DEPENDS = "fakeroot-native" -RRECOMMEND = "fuse" +RRECOMMENDS = "fuse" + +PR = "r1" SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" S = "${WORKDIR}/fuse-${PV}" diff --git a/packages/fuse/fuse_2.4.2.bb b/packages/fuse/fuse_2.4.2.bb deleted file mode 100644 index a51c659153..0000000000 --- a/packages/fuse/fuse_2.4.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -HOMEPAGE = "http://fuse.sf.net" -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" - -LICENSE_${PN} = "LGPL" - -DEPENDS = "fakeroot-native" -RRECOMMENDS_${PN} = "fuse-module" - -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" - -inherit autotools pkgconfig -EXTRA_OECONF = " --disable-kernel-module" - -fakeroot do_install() { -oe_runmake install DESTDIR=${D} -} - -fakeroot do_stage() { -autotools_stage_all -} - - diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb index 8aa1f3578d..2f893d5192 100644 --- a/packages/fuse/fuse_2.5.3.bb +++ b/packages/fuse/fuse_2.5.3.bb @@ -4,8 +4,10 @@ MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" LICENSE_${PN} = "LGPL" +PR = "r1" + DEPENDS = "fakeroot-native" -RRECOMMENDS_${PN} = "fuse-module" +RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse" #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils PACKAGES += "fuse-utils" diff --git a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb index dcf8640611..ed69f01df1 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -DESCIPTION = "Buttonbox for gpe" +DESCRIPTION = "Buttonbox for gpe" MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" DEPENDS = "libgpewidget libgpelaunch" diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb index 86e5cabcf0..f982c4517f 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" LICENSE = "GPL" -DESCIPTION = "Buttonbox for gpe" +DESCRIPTION = "Buttonbox for gpe" SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox" |