[Frugalware-git] pacman-tools: repoman * delete() make verbose local * it gets sometimes empty and repoman server delete ha syntax errors * ( I found out when using a tunneled conenction )
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=58af7ac20f1a56a96e3703afe241a7373eedcbe8 commit 58af7ac20f1a56a96e3703afe241a7373eedcbe8 Author: crazy cr...@frugalware.org Date: Tue Feb 16 19:33:58 2010 +0100 repoman * delete() make verbose local * it gets sometimes empty and repoman server delete ha syntax errors * ( I found out when using a tunneled conenction ) diff --git a/repoman b/repoman index 22a7b3c..14a0cbc 100755 --- a/repoman +++ b/repoman @@ -296,7 +296,7 @@ delete() if ! ask repoman del $*; then return fi - local files rmopts host + local files rmopts host verbose check_servers check_sudo if [ $verbose != 0 ]; then ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-tools: repoman.conf * add repoman_{ssh, scp} and REPOMAN_USE_TUNNEL
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=e1c492104059bf5b773b3e12aa96ef39ab77244b
commit e1c492104059bf5b773b3e12aa96ef39ab77244b
Author: crazy cr...@frugalware.org
Date: Tue Feb 16 19:39:02 2010 +0100
repoman.conf
* add repoman_{ssh,scp} and REPOMAN_USE_TUNNEL
diff --git a/repoman.conf b/repoman.conf
index e170603..b6240c9 100644
--- a/repoman.conf
+++ b/repoman.conf
@@ -19,6 +19,20 @@ makepkg_opts=-u -i -c -s -w /var/cache/pacman-g2/pkg -H
# ignored on repoman upgrade. example: upgrade_ignore=acroread skype
upgrade_ignore=
+# Allow users to use custom SSH/SCP
+# Is good when you have to tunnel your connection over different server
+# and need custom scripts 'as' these commands
+
+# DEFAULTS:
+# repoman_ssh=ssh
+# repoman_scp=scp
+# REPOMAN_USE_TUNNEL=no
+# See README.Frugalware on HowTo use these
+
+REPOMAN_USE_TUNNEL=no
+repoman_ssh=ssh
+repoman_scp=scp
+
# User configuration
if [ -e ~/.repoman.conf ]; then
source ~/.repoman.conf
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-tools: repoman * replace ssh , scp with repoman_{ssh, scp} * scp part for tunnels is now a bit hacky and * only works over localhost see comments in code
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=13a0d2eca383f06b5c019b71d3027a848b0d88ef
commit 13a0d2eca383f06b5c019b71d3027a848b0d88ef
Author: crazy cr...@frugalware.org
Date: Tue Feb 16 20:05:29 2010 +0100
repoman
* replace ssh , scp with repoman_{ssh,scp}
* scp part for tunnels is now a bit hacky and
* only works over localhost see comments in code
diff --git a/repoman b/repoman
index 14a0cbc..f382929 100755
--- a/repoman
+++ b/repoman
@@ -305,7 +305,7 @@ delete()
verbose=
fi
msg Deleting file(s): $*
- ssh $host $sudo_cmd repoman server delete '$verbose' '$path' $*
+ $repoman_ssh $host $sudo_cmd repoman server delete '$verbose' '$path'
$*
}
upload()
@@ -348,12 +348,24 @@ upload()
fi
name=`basename $src`
msg Requesting a temporary file
- tmp=`ssh $host $sudo_cmd repoman server mktemp`
+ tmp=`$repoman_ssh $host $sudo_cmd repoman server mktemp`
[ -z $tmp ] exit 1
- msg Uploading file: $src (to $tmp)
- scp $src $host:$tmp
+ if [ $REPOMAN_USE_TUNNEL == yes ]; then
+ ## Fix me ? well since we use something like:
+ ## local - genesis ( genesis acts like tunnel for
itself )
+ ## or remote_box - genesis , local - remote_box we
are always
+ ## using 127.0.0.1 .. scp -S really sucks and I get a
lot problems
+ ## with rsync -e with all this tunneling =)
+ ## the other solution may be to force host when tunnel
is used to be u...@127.0.0.1
+ ## since -p port u...@local gives out u...@genesis ..
+ msg Uploading file: $src (to $tmp) over local tunnel.
+$repoman_scp $src 127.0.0.1:$tmp
+else
+ msg Uploading file: $src (to $tmp)
+$repoman_scp $src $host:$tmp
+fi
sha=`sha1sum $src|sed 's/\(.*\) .*/\1/'`
- ssh $host $sudo_cmd repoman server upload '$path' '$tmp'
'$sha' '$dest/$src'
+ $repoman_ssh $host $sudo_cmd repoman server upload '$path'
'$tmp' '$sha' '$dest/$src'
done
}
@@ -376,7 +388,7 @@ fpmmerge()
mergearchs=`rsync -vP $srcurl/|grep ^d.*frugalware-|sed 's/.* //'`
for i in $mergearchs
do
- ssh $host $sudo_cmd repoman server rsync '$path'
'${srcurl#*:}' '${i//frugalware-}'
+ $repoman_ssh $host $sudo_cmd repoman server rsync '$path'
'${srcurl#*:}' '${i//frugalware-}'
done
# now push
@@ -398,7 +410,7 @@ list()
check_servers
check_sudo
msg Fetching contents of: $*
- ssh $host $sudo_cmd repoman server list '$path' $*
+ $repoman_ssh $host $sudo_cmd repoman server list '$path' $*
}
split_group_pkg()
@@ -422,7 +434,7 @@ clean()
do
msg Cleaning up $i
split_group_pkg $i
- ssh $host $sudo_cmd repoman server clean '$path' '$fdb'
'$group' '$pkg'
+ $repoman_ssh $host $sudo_cmd repoman server clean '$path'
'$fdb' '$group' '$pkg'
done
}
@@ -437,7 +449,7 @@ changelog()
check_sudo
fdb=$(eval echo \$${reponame}_fdb)
[ -z $fdb ] fdb=$reponame.fdb
- ssh $host $sudo_cmd repoman server changelog '$path' '$fdb' '$group'
'$pkg' '$arch'
+ $repoman_ssh $host $sudo_cmd repoman server changelog '$path' '$fdb'
'$group' '$pkg' '$arch'
}
_keypress()
@@ -568,7 +580,7 @@ srcdel()
srclocal=(${srcloc...@]} ${signatur...@]})
if [ $F_makepkg_scm = git ]; then
check_servers
- for i in $(ssh $host [ -d $path/$mydir ] cd $path/$mydir
git ls-files --others --directory)
+ for i in $($repoman_ssh $host [ -d $path/$mydir ] cd
$path/$mydir git ls-files --others --directory)
do
if ! echo ${srcloc...@]} |grep -q $i ! _is_log $i [ $i != Changelog
]; then
dry_run delete $mydir/$i
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-tools: repoman: added ci ( commit info function ) * added for now 'ci' command to replace : * repoman rec kill it paste use git .. paste here * when moving / removin
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=81ed76d0dee77d2f443046fd403b93059a695d6c
commit 81ed76d0dee77d2f443046fd403b93059a695d6c
Author: crazy cr...@frugalware.org
Date: Thu Feb 18 11:04:08 2010 +0100
repoman: added ci ( commit info function )
* added for now 'ci' command to replace :
* repoman rec kill it paste use git .. paste here
* when moving / removing packages ..
* cd some_group/package , repoman ci. This will generate:
* == Your git commit command is:
* == git commit -a -e -m package-pkgver-pkgrel-arch
diff --git a/repoman b/repoman
index f382929..23c883d 100755
--- a/repoman
+++ b/repoman
@@ -519,6 +519,19 @@ $@ | darcs rec -a --pipe .
fi
}
+__pkg_commit_info()
+{
+ local commitmsg
+ commitmsg=$pkgname-$pkgver-$pkgrel-$arch
+ msg Your git commit command is:
+ msg git commit -a -e -m $commitmsg
+}
+
+commit_info()
+{
+ __pkg_commit_info
+}
+
record()
{
echo -n Checking FrugalBuild...
@@ -1016,6 +1029,10 @@ if [ $1 != ]; then
shift 1
upgrade $*
;;
+ ci)
+ shift 1
+ commit_info $*
+ ;;
*)
echo Unknown command: $1
usage
diff --git a/repoman.txt b/repoman.txt
index 479022a..1e74b91 100644
--- a/repoman.txt
+++ b/repoman.txt
@@ -218,14 +218,14 @@ In this example, we'll remove the synaptics package:
$ cd ~/git/current/source/x11-extra/synaptics
-$ repoman rec 1
+$ repoman ci 1
$ cd ..
$ rm -rf synaptics
-$ git commit -a -e -m paste here the patchname
+$ use commit command generated by repoman ci
$ dg push -a 2
$ repoman clean x11-extra/synaptics 3
-1 This will generate a nice patch name for you, copy it to the clipboard,
and hit Ctrl-C
+1 This will generate a nice patch name and give you the git commit command.
2 This removes the buildscript and other tracked files
3 This removes everything else
@@ -240,12 +240,12 @@ $ cd ~/git/current/source
$ git mv network/netkit-rsh network-extra
$ cd network-extra/netkit-rsh
$ vi FrugalBuild 1
-$ repoman rec 2
-$ git commit -a -e -m paste here the patchname
+$ repoman ci 2
+$ use commit command generated by repoman ci
$ dg push -a 3
1 Edit the FrugalBuild: increment the pkgrel value by one
-2 This will generate a nice patch name for you, copy it to the clipboard,
and hit Ctrl-C
+2 This will generate a nice patch name and give you the git commit command.
3 This will move the tracked files and then the git hook will move the
untracked files as well
NOTE: Incrementing the pkgrel value is not a must, for huge packages it
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] homepage-ng: * added a picture for the future Locris release announcement
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=4ef2b12b40e744f27e5a0406ccbe3d331c06eb5b commit 4ef2b12b40e744f27e5a0406ccbe3d331c06eb5b Author: Devil505 devil505li...@gmail.com Date: Thu Feb 18 11:22:15 2010 +0100 * added a picture for the future Locris release announcement diff --git a/frugalware/images/locris.png b/frugalware/images/locris.png new file mode 100644 index 000..99b4399 Binary files /dev/null and b/frugalware/images/locris.png differ ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] homepage-ng: * added an icon for newsleter #57 (testing)
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=4bb95de0d96b1570c1107875bb66e17b8c33547c commit 4bb95de0d96b1570c1107875bb66e17b8c33547c Author: Devil505 devil505li...@gmail.com Date: Thu Feb 18 11:40:14 2010 +0100 * added an icon for newsleter #57 (testing) diff --git a/frugalware/images/newsletter/package.png b/frugalware/images/newsletter/package.png new file mode 100644 index 000..4b55b50 Binary files /dev/null and b/frugalware/images/newsletter/package.png differ diff --git a/frugalware/weeklynews/issue57.html b/frugalware/weeklynews/issue57.html index 8f828bd..66a3614 100644 --- a/frugalware/weeklynews/issue57.html +++ b/frugalware/weeklynews/issue57.html @@ -286,7 +286,7 @@ /dd /dl - h2New Packages/h2 + img src=http://frugalware.org/images/newsletter/package.png; align=lefth2New Packages/h2 pIn this new section of the newsletter I'll highlight some new packages which have been added since the previous issue./p @@ -388,7 +388,7 @@ tricks that you would like to be shown in the newsletter, emplease/em post them on the forums./p - h2Focus On Package(s)/h2 + img src=http://frugalware.org/images/newsletter/package.png; align=lefth2Focus On Package(s)/h2 h3Chromium B.S.U. (the game)/h3 ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] homepage-ng: * added icons for newsletters
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=38143b7f7d0eb310accd8ed0f04e11ce41a1192d commit 38143b7f7d0eb310accd8ed0f04e11ce41a1192d Author: Devil505 devil505li...@gmail.com Date: Thu Feb 18 11:46:39 2010 +0100 * added icons for newsletters diff --git a/frugalware/images/newsletter/bug.png b/frugalware/images/newsletter/bug.png new file mode 100644 index 000..6c50ef4 Binary files /dev/null and b/frugalware/images/newsletter/bug.png differ diff --git a/frugalware/images/newsletter/community.png b/frugalware/images/newsletter/community.png new file mode 100644 index 000..749c825 Binary files /dev/null and b/frugalware/images/newsletter/community.png differ diff --git a/frugalware/images/newsletter/events.png b/frugalware/images/newsletter/events.png new file mode 100644 index 000..096e848 Binary files /dev/null and b/frugalware/images/newsletter/events.png differ diff --git a/frugalware/images/newsletter/tips.png b/frugalware/images/newsletter/tips.png new file mode 100644 index 000..6e52db7 Binary files /dev/null and b/frugalware/images/newsletter/tips.png differ diff --git a/frugalware/weeklynews/issue57.html b/frugalware/weeklynews/issue57.html index 66a3614..a4aaded 100644 --- a/frugalware/weeklynews/issue57.html +++ b/frugalware/weeklynews/issue57.html @@ -286,7 +286,7 @@ /dd /dl - img src=http://frugalware.org/images/newsletter/package.png; align=lefth2New Packages/h2 + img src=http://frugalware.org/images/newsletter/package.png; align=left h2New Packages/h2 pIn this new section of the newsletter I'll highlight some new packages which have been added since the previous issue./p @@ -388,7 +388,7 @@ tricks that you would like to be shown in the newsletter, emplease/em post them on the forums./p - img src=http://frugalware.org/images/newsletter/package.png; align=lefth2Focus On Package(s)/h2 + img src=http://frugalware.org/images/newsletter/package.png; align=left h2Focus On Package(s)/h2 h3Chromium B.S.U. (the game)/h3 ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] homepage-ng: * added icons to newsletter #57
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=89afe9aae6e588c25c43ca860b4f9fc32c753fcb commit 89afe9aae6e588c25c43ca860b4f9fc32c753fcb Author: Devil505 devil505li...@gmail.com Date: Thu Feb 18 11:48:40 2010 +0100 * added icons to newsletter #57 diff --git a/frugalware/weeklynews/issue57.html b/frugalware/weeklynews/issue57.html index a4aaded..d5ae5f7 100644 --- a/frugalware/weeklynews/issue57.html +++ b/frugalware/weeklynews/issue57.html @@ -24,7 +24,7 @@ liFLOSS developers are people too - Jeff Bailes/li /ul - h2Events/h2 +img src=http://frugalware.org/images/newsletter/events.png; align=left h2Events/h2 pHere's a selection of events which have occurred since the previous newsletter:/p @@ -127,7 +127,7 @@ /li /ul - h2Getting To Know You/h2 +img src=http://frugalware.org/images/newsletter/community.png; align=left h2Getting To Know You/h2 pIn this section of the newsletter, we get to know Frugalware Linux a little at a time. This is not meant to replace the official documentation but @@ -175,7 +175,7 @@ and since patches go against this principle, they're used only when absolutely necessary./p - h2FLOSS developers are people too/h2 +img src=http://frugalware.org/images/newsletter/community.png; align=left h2FLOSS developers are people too/h2 pWithout developers, we wouldn't have the Linux kernel and all the software that we run on the platform. What motivates FLOSS developers? Why does anyone @@ -353,7 +353,7 @@ /tr /table - h2Tips and tricks/h2 +img src=http://frugalware.org/images/newsletter/tips.png; align=left h2Tips and tricks/h2 pbDisclaimer/b - Be aware that the hints amp; tips provided here have NOT been tested and so come with no warranty./p @@ -426,7 +426,7 @@ not nearly as many available as for Firefox. Take the time to try Chromium and judge for yourself whether or not it's a better browser./p - h2Bug fixes/h2 +img src=http://frugalware.org/images/newsletter/bug.png; align=left h2Bug fixes/h2 pThe following table gives you a overview of activity on bugs and feature requests as at 4 February 2010. In each cell of the table is a link to a @@ -479,7 +479,7 @@ /tr /table - h2Security announcements/h2 +img src=http://frugalware.org/images/newsletter/bug.png; align=left h2Security announcements/h2 pbRemember/b - According to the normal support arrangements for Frugalware, the release of 1.1 (Getorin) means ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] homepage-ng: * added new icons for newsletters
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=31665abb56ea6b7c9772f0b81e6fe0a3837341b3 commit 31665abb56ea6b7c9772f0b81e6fe0a3837341b3 Author: Devil505 devil505li...@gmail.com Date: Thu Feb 18 11:52:11 2010 +0100 * added new icons for newsletters diff --git a/frugalware/images/newsletter/newsletter.png b/frugalware/images/newsletter/newsletter.png new file mode 100644 index 000..ebc528f Binary files /dev/null and b/frugalware/images/newsletter/newsletter.png differ diff --git a/frugalware/images/newsletter/security.png b/frugalware/images/newsletter/security.png new file mode 100644 index 000..aadcb91 Binary files /dev/null and b/frugalware/images/newsletter/security.png differ ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] homepage-ng: * added new icons in newsletter #57
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f45266735c5bb9e40f2085866cf9fd16a6153d3e commit f45266735c5bb9e40f2085866cf9fd16a6153d3e Author: Devil505 devil505li...@gmail.com Date: Thu Feb 18 11:52:53 2010 +0100 * added new icons in newsletter #57 diff --git a/frugalware/weeklynews/issue57.html b/frugalware/weeklynews/issue57.html index d5ae5f7..9fc8c2f 100644 --- a/frugalware/weeklynews/issue57.html +++ b/frugalware/weeklynews/issue57.html @@ -479,7 +479,7 @@ /tr /table -img src=http://frugalware.org/images/newsletter/bug.png; align=left h2Security announcements/h2 +img src=http://frugalware.org/images/newsletter/security.png; align=left h2Security announcements/h2 pbRemember/b - According to the normal support arrangements for Frugalware, the release of 1.1 (Getorin) means @@ -513,7 +513,7 @@ /tr /table - h2About the newsletter/h2 + img src=http://frugalware.org/images/newsletter/newsletter.png; align=left h2About the newsletter/h2 h3Author/h3 ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: doc/Makefile.am: sort the if HAS... to avoid compile errors * sorted out issues with --enable / --disable doc/man types * HAS_DOXYGEN true need HAS_ASCIIDOC true to work *
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7c650a9b6138a6c773313d0577b9256b0cefcb38 commit 7c650a9b6138a6c773313d0577b9256b0cefcb38 Author: crazy cr...@frugalware.org Date: Thu Feb 18 14:57:26 2010 +0100 doc/Makefile.am: sort the if HAS... to avoid compile errors * sorted out issues with --enable / --disable doc/man types * HAS_DOXYGEN true need HAS_ASCIIDOC true to work * !HAS_ASCIIDOC need disable HAS_DOXYGEN true * since HAS_DOXYGEN want man3 which is there only with HAS_ASCIIDOC diff --git a/doc/Makefile.am b/doc/Makefile.am index c124c6b..6a575ef 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,11 +1,12 @@ if HAS_ASCIIDOC +man3 = libpacman.3 man5 = FrugalBuild.5 man8 = makepkg.8 pacman-g2.8 endif -localized_MANS = $(man5) $(man8) +localized_MANS = $(man5) $(man8) $(man3) localized_LANGS = $(shell grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //') @@ -16,14 +17,11 @@ convert_MAN = \ if HAS_ASCIIDOC man_MANS = $(localized_MANS) $(man3_MANS) -else -man_MANS = -endif - if HAS_DOXYGEN man_MANS += libpacman.3 man3/* +endif else -man3_MANS = libpacman.3 +man_MANS = endif if HAS_ASCIIDOC ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: bindings/vala/Makefile.in * missing clean: , that broke make clean
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=84f3c941c3b174be00bcf90bd8506725418409a0 commit 84f3c941c3b174be00bcf90bd8506725418409a0 Author: crazy cr...@frugalware.org Date: Thu Feb 18 15:04:58 2010 +0100 bindings/vala/Makefile.in * missing clean: , that broke make clean diff --git a/bindings/vala/Makefile.in b/bindings/vala/Makefile.in index 2ce7db9..52bbad4 100644 --- a/bindings/vala/Makefile.in +++ b/bindings/vala/Makefile.in @@ -7,7 +7,9 @@ install: mkdir -p $(DESTDIR)/$(prefix)/share/vala/vapi install -m644 pacman.vapi $(DESTDIR)/$(prefix)/share/vala/vapi/pacman.vapi -distclean: +clean: rm -f Makefile +distclean: clean + check: ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: bindings/vala/Makefile.in * well Makefile.am would not be bad :)
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=930d5a9558d224b12a901cee5ada00acdfea4f8c commit 930d5a9558d224b12a901cee5ada00acdfea4f8c Author: crazy cr...@frugalware.org Date: Thu Feb 18 16:58:39 2010 +0100 bindings/vala/Makefile.in * well Makefile.am would not be bad :) diff --git a/bindings/vala/Makefile.in b/bindings/vala/Makefile.in index 52bbad4..ca77d35 100644 --- a/bindings/vala/Makefile.in +++ b/bindings/vala/Makefile.in @@ -8,8 +8,8 @@ install: install -m644 pacman.vapi $(DESTDIR)/$(prefix)/share/vala/vapi/pacman.vapi clean: - rm -f Makefile - + distclean: clean +rm -f Makefile check: ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: add m4 to igore also
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=da8e3fbd3d35eaeeadf9d85f856c635f655ae1b9 commit da8e3fbd3d35eaeeadf9d85f856c635f655ae1b9 Author: crazy cr...@frugalware.org Date: Thu Feb 18 16:59:50 2010 +0100 add m4 to igore also diff --git a/.gitignore b/.gitignore index 77f4a46..db1beb9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ LINGUAS POTFILES libtool ltmain.sh +m4 ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pam: udisks-1.0.0-1-x86_64 *new package
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pam.git;a=commitdiff;h=008baa650491657dbaab1375857d1cf7fc10a561
commit 008baa650491657dbaab1375857d1cf7fc10a561
Author: bouleetbil bouleet...@frogdev.info
Date: Thu Feb 18 16:27:05 2010 +0100
udisks-1.0.0-1-x86_64
*new package
diff --git a/source/apps-extra/udisks/FrugalBuild
b/source/apps-extra/udisks/FrugalBuild
new file mode 100644
index 000..c611357
--- /dev/null
+++ b/source/apps-extra/udisks/FrugalBuild
@@ -0,0 +1,23 @@
+# Compiling time: 0.07 SBU
+# Maintainer: bouleetbil bouleet...@frogdev.info
+
+pkgname=udisks
+pkgver=1.0.0
+extraver=git20091202
+pkgrel=1
+pkgdesc=Storage Management Service
+url=http://www.freedesktop.org/wiki/Software/udisks;
+depends=('dbus-glib' 'udev' 'polkit' 'parted' 'lvm2' \
+ 'libatasmart' 'sg3-utils' 'libgudev' 'e2fsprogs' 'dosfstools' 'mtools')
+makedepends=('intltool')
+Fconfopts=$Fconfopts --disable-man-pages
+groups=('apps-extra')
+archs=('i686' 'x86_64' 'ppc')
+up2date=Flasttar http://hal.freedesktop.org/releases/;
+source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.$extraver.tar.gz)
+sha1sums=('e7c5ac9b1d2db17d44dd733cebec80b5ca50e08a')
+replaces=('devicekit-disks')
+# No pkgconfig file
+export DEVMAPPER_CFLAGS=-I/usr/include DEVMAPPER_LIBS=-ldevmapper
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] xorgtesting: libdrm-2.4.18-2-x86_64 *enable --enable-libkms for hermier :) *added missing files in the archive
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=f69f4f655f208a9631296f40d18e9a79bb267051
commit f69f4f655f208a9631296f40d18e9a79bb267051
Author: bouleetbil bouleet...@frogdev.info
Date: Thu Feb 18 17:38:03 2010 +0100
libdrm-2.4.18-2-x86_64
*enable --enable-libkms for hermier :)
*added missing files in the archive
diff --git a/source/x11/libdrm/FrugalBuild b/source/x11/libdrm/FrugalBuild
index 6ebac35..e2bb0d4 100644
--- a/source/x11/libdrm/FrugalBuild
+++ b/source/x11/libdrm/FrugalBuild
@@ -5,7 +5,7 @@ USE_DEVEL=${USE_DEVEL:-n}
pkgname=libdrm
pkgver=2.4.18
-pkgrel=1
+pkgrel=2
pkgdesc=X.Org Userspace interface to kernel DRM services
url=http://xorg.freedesktop.org/;
depends=('libpthread-stubs')
@@ -18,9 +18,10 @@ if Fuse $USE_DEVEL; then
Finclude scm
else
up2date=Flasttar http://dri.freedesktop.org/libdrm/;
- source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
Fix_include.diff)
+ source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
Fix_include.diff internal.h)
sha1sums=('eaf66dd1a74e39830daab8249197e9eb02c5a81e' \
- '148669a50224824d6f64f87bfcae99b00b6f9e34')
+ '148669a50224824d6f64f87bfcae99b00b6f9e34' \
+ '6d7192f6d27fad6ba0099d6be10d555c242a445d')
fi
build()
@@ -29,12 +30,13 @@ build()
Funpack_scm
./autogen.sh
fi
-# Missing --enable-libkms (does not compile for now)
+ cp $Fsrcdir/internal.h $pkgname-$pkgver/libkms/internal.h || Fdie
Fbuild \
--enable-intel \
--enable-radeon \
--enable-nouveau-experimental-api \
- --enable-vmwgfx-experimental-api
+ --enable-vmwgfx-experimental-api \
+ --enable-libkms
}
# optimization OK
diff --git a/source/x11/libdrm/internal.h b/source/x11/libdrm/internal.h
new file mode 100644
index 000..5c5dba9
--- /dev/null
+++ b/source/x11/libdrm/internal.h
@@ -0,0 +1,72 @@
+/**
+ *
+ * Copyright © 2009 VMware, Inc., Palo Alto, CA., USA
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * Software), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **/
+
+
+#ifndef INTERNAL_H_
+#define INTERNAL_H_
+
+#include libkms.h
+
+struct kms_driver
+{
+ int (*get_prop)(struct kms_driver *kms, const unsigned key,
+ unsigned *out);
+ int (*destroy)(struct kms_driver *kms);
+
+ int (*bo_create)(struct kms_driver *kms,
+unsigned width,
+unsigned height,
+enum kms_bo_type type,
+const unsigned *attr,
+struct kms_bo **out);
+ int (*bo_get_prop)(struct kms_bo *bo, const unsigned key,
+ unsigned *out);
+ int (*bo_map)(struct kms_bo *bo, void **out);
+ int (*bo_unmap)(struct kms_bo *bo);
+ int (*bo_destroy)(struct kms_bo *bo);
+
+ int fd;
+};
+
+struct kms_bo
+{
+ struct kms_driver *kms;
+ void *ptr;
+ size_t size;
+ size_t offset;
+ size_t pitch;
+ unsigned handle;
+};
+
+int linux_create(int fd, struct kms_driver **out);
+
+int vmwgfx_create(int fd, struct kms_driver **out);
+
+int intel_create(int fd, struct kms_driver **out);
+
+#endif
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw-initramfs: create_archive.sh *typo fix
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-initramfs.git;a=commitdiff;h=628847158990240dac587dca8db36c82d10df88b commit 628847158990240dac587dca8db36c82d10df88b Author: bouleetbil bouleet...@frogdev.info Date: Thu Feb 18 23:48:44 2010 +0100 create_archive.sh *typo fix diff --git a/create_archive.sh b/create_archive.sh index 48b7ca2..5c6e75a 100755 --- a/create_archive.sh +++ b/create_archive.sh @@ -2,4 +2,4 @@ # For create the tar.gz release -tar -a -c -p --add-file=ChangeLog --add-file=create_initramfs.sh --add-file=init --add-file=LICENSE --add-file=README --add-file=TODO --add-file=create_usblive.sh --add-file=modules.sh --add-file=liveusbkey --add-file=init_functions.sh --add-file=create_functions.sh --add-file=fstab.usbkey --add-file=Makefile --add-file=extlinux.conf --add-files=default.sh --add-files=create_static.sh --add-files=busybox.config --file=fw-initramfs.tar.gz +tar -a -c -p --add-file=ChangeLog --add-file=create_initramfs.sh --add-file=init --add-file=LICENSE --add-file=README --add-file=TODO --add-file=create_usblive.sh --add-file=modules.sh --add-file=liveusbkey --add-file=init_functions.sh --add-file=create_functions.sh --add-file=fstab.usbkey --add-file=Makefile --add-file=extlinux.conf --add-file=default.sh --add-file=create_static.sh --add-file=busybox.config --file=fw-initramfs.tar.gz ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
