**** BEGIN LOGGING AT Sat Feb 07 02:59:59 2015
Feb 07 07:20:55 <builder> build #287 of omap is complete: Failure [failed compile_4]  Build details are at http://buildbot.openwrt.org:8010/builders/omap/builds/287
Feb 07 10:09:42 <OpenWrt-Commits> nbd r44297 trunk/include/prereq.mk * include/prereq.mk: fix echo commands with simple /bin/sh
Feb 07 10:10:06 <OpenWrt-Commits> nbd r44298 trunk/include/ prereq-build.mk prereq.mk * build: accept apple llvm as fallback for gcc/g++
Feb 07 10:27:05 <OpenWrt-Commits> nico r44299 packages/net/keepalived * keepalived: moved to github
Feb 07 10:27:07 <OpenWrt-Commits> nico r44300 packages/libs/check * check: moved to github
Feb 07 11:07:28 <mwarning> hi, is there a convenience shell function on OpenWrt to check if a value is in a space separated list?
Feb 07 11:07:53 <mwarning> if [ "a" in "a b c" ]; then..
Feb 07 11:08:10 <mwarning> ^ well, that is not legal, of course.
Feb 07 11:11:17 <plntyk> mwarning: you mean sth like http://stackoverflow.com/questions/229551/string-contains-in-bash ?
Feb 07 11:12:36 <mwarning> yes, but for ash, not bash
Feb 07 11:13:09 <mwarning> if [ "$a" != "${a/$items/}" ]; then
Feb 07 11:13:21 <mwarning> ^ I know this trick, but it may lead to false positives
Feb 07 13:35:51 <OpenWrt-Commits> jow r44301 trunk/package/network/ipv6/ 6in4/Makefile 6in4/files/6in4.sh * 6in4: don't use /dev/stdout for wget calls
Feb 07 14:10:11 <builder> build #877 of orion is complete: Failure [failed compile_1]  Build details are at http://buildbot.openwrt.org:8010/builders/orion/builds/877
Feb 07 14:26:04 <builder> build #62 of ramips.mt7621 is complete: Failure [failed compile_4]  Build details are at http://buildbot.openwrt.org:8010/builders/ramips.mt7621/builds/62
Feb 07 14:42:11 <builder> build #330 of pxa is complete: Failure [failed shell_10]  Build details are at http://buildbot.openwrt.org:8010/builders/pxa/builds/330
**** BEGIN LOGGING AT Sat Feb 07 14:45:57 2015
Feb 07 17:44:03 <DonkeyHotei> cyrusff: removing that line did not fix the issue
Feb 07 17:51:12 <OpenWrt-Commits> luka r44302 trunk/ include/kernel-version.mk target/linux/generic/patches-3.14/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch target/linux/generic/patches-3.14/902-debloat_proc.patch * kernel: update 3.14 to 3.14.32
Feb 07 17:51:15 <OpenWrt-Commits> luka r44303 trunk/target/ (20 files) * ar71xx: refresh patches
Feb 07 18:01:06 <builder> build #885 of at91 is complete: Success [build successful]  Build details are at http://buildbot.openwrt.org:8010/builders/at91/builds/885
Feb 07 18:36:59 <Zero_Chaos> gaah, new requirements for every PR
Feb 07 18:37:13 <Zero_Chaos> but this time they want me to learn to git properly, heh
Feb 07 18:37:20 <Zero_Chaos> that's a lot harder :-)
Feb 07 18:37:49 <groz> PR ??
Feb 07 18:38:18 <Zero_Chaos> pull request
Feb 07 18:38:44 <Zero_Chaos> I'm trying to become a maintainer for a few packages, the work isn't terrible, but the learning curve for the process (especially using git) is a bit harder for me.
Feb 07 18:47:12 <Zero_Chaos> noob question, but does anyone have some time to teach me a little git-fu? I lack the skill to do things such as "squash multiple commits into one" as requested for my PR
Feb 07 18:49:47 <DonkeyHotei> git reset --soft <commit id>
Feb 07 18:50:56 <jow_laptop> Zero_Chaos: iirc it was already suggested right in the pr
Feb 07 18:51:12 <jow_laptop> Zero_Chaos: assuming you want to squash the last five commits, run  git rebase -i HEAD~5
Feb 07 18:51:27 <jow_laptop> Zero_Chaos: change all "pick" to "squash" (or just "s")
Feb 07 18:51:53 <Zero_Chaos> jow_laptop: git scares me a lot, I'm used to cvs and svn so it's confusing for me :-)
Feb 07 18:52:09 <DonkeyHotei> i'm still used to svn myself
Feb 07 18:52:23 <karlp> Zero_Chaos: best trick is to use mroe branches
Feb 07 18:52:30 <Zero_Chaos> jow_laptop: yeah I tried to follow and broke things already
Feb 07 18:52:45 <karlp> it meas that you can just do "git rebase -i master" instead of having to work out what's up and down and ~ vs ^ vs blah
Feb 07 18:52:47 <Zero_Chaos> karlp: yeah, I was kinda considering just killing this branch and making a new one. that seems sooo much easier
Feb 07 18:53:27 <karlp> treat branches as free and a lot of things get easier to understand
Feb 07 18:53:53 <Zero_Chaos> karlp: forget treating branches as free, treat my time as worth something and branches make more sense than most everything else :-)
Feb 07 18:54:46 <Zero_Chaos> zero@new-host-4 openwrt-packages-fork % git checkout master
Feb 07 18:54:46 <Zero_Chaos> net/aircrack-ng/Makefile: needs merge
Feb 07 18:54:46 <Zero_Chaos> error: you need to resolve your current index first
Feb 07 18:54:58 <Zero_Chaos> can I easily destroy the branch I'm on and switch back to master?
Feb 07 18:55:05 <jow_laptop> sure
Feb 07 18:55:09 <jow_laptop> git checkout master
Feb 07 18:55:15 <jow_laptop> git branch -D oldbrnachname
Feb 07 18:55:16 <Zero_Chaos> jow_laptop: ^^ that failed
Feb 07 18:55:23 <jow_laptop> failed how?
Feb 07 18:55:33 <karlp> probably uncommited changes that would be trampled
Feb 07 18:55:38 <Zero_Chaos> jow_laptop: failed like I pasted 8 lines up?
Feb 07 18:55:50 <karlp> git checkout -p to interactively throw away changes
Feb 07 18:55:51 <jow_laptop> git reset --hard HEAD
Feb 07 18:56:09 <jow_laptop> is similar to svn revert -R .
Feb 07 18:56:22 <jow_laptop> thne you should be able to checkout master again
Feb 07 18:56:39 <Zero_Chaos> jow_laptop: it warns me that I'm leaving commits behind, assuming I'm fine with that, I can ignore the message?
Feb 07 18:56:46 <DonkeyHotei> except svn revert saves your changes for un-revert
Feb 07 18:57:14 <jow_laptop> must be a new feature
Feb 07 18:57:26 <Zero_Chaos> Warning: you are leaving 2 commits behind, not connected to
Feb 07 18:57:26 <Zero_Chaos> any of your branches:
Feb 07 18:57:29 <Zero_Chaos> I get that on checkout
Feb 07 18:59:25 <Zero_Chaos> https://bpaste.net/show/f716cc663324
Feb 07 18:59:44 <Zero_Chaos> I reset hard, checkout master, make a new branch, add my file, and status shows this confusing stuff ^^
Feb 07 19:00:40 <jow_laptop> try  git rebase --abort
Feb 07 19:00:59 <jow_laptop> your previously failing interactive squashing rebase session is probably still "running"
Feb 07 19:01:28 <Zero_Chaos> jow_laptop: that cleaned up status just a little too much, now it shows I have nothing to commit, and running "git add Makefile" doesn't seem to do anything
Feb 07 19:02:22 <karlp> (I find it helpful to get the bash prompt to show the branch, dirty state and whether I'm inside a rebase/merge/cherrypick)
Feb 07 19:02:24 <jow_laptop> the state should be completely pristine now
Feb 07 19:02:35 <jow_laptop> like if you did nothing at all
Feb 07 19:02:47 <jow_laptop> I suggest this now:
Feb 07 19:02:53 <Zero_Chaos> okay, i got it
Feb 07 19:03:06 <Zero_Chaos> the abort left me on the wrong branch
Feb 07 19:03:39 <jow_laptop> git branch add-aircrack; git checkout add-aircrack; mkdir net/aircrack; wget -O net/aircrack/Makefile https://raw.githubusercontent.com/ZeroChaos-/packages/aircrack-ng/net/aircrack-ng/Makefile; git add net/aircrack; git commit -s
Feb 07 19:03:49 <Zero_Chaos> jow_laptop: to help avoid more of me learning to use git, can you review this real quick? https://bpaste.net/show/fe37fb0fb961
Feb 07 19:04:02 <jow_laptop> if done; git push origin add-aircrack
Feb 07 19:04:09 <Zero_Chaos> jow_laptop: I have a clean branch with only that change now, assuming that change is right, I can make a push and PR from it
Feb 07 19:04:31 <jow_laptop> if you then visit your github profile in a browser you should see a notification bar telling you that you recently pushed "add-aircrack" where you directly make a pr from
Feb 07 19:04:45 <jow_laptop> you can also update your pr after the fact by pushing into this branch
Feb 07 19:05:02 <jow_laptop> ok, wait
Feb 07 19:05:31 <jow_laptop> you did not provide a realname in the maintainer field
Feb 07 19:05:41 <Zero_Chaos> jow_laptop: ahh, thanks, I'll fix that
Feb 07 19:06:02 <jow_laptop> also not strictly wrong but I suggest replacing $(CP) with $(INSTALL_BIN)
Feb 07 19:06:14 <jow_laptop> this will call install -m755 blah dest
Feb 07 19:06:22 <jow_laptop> so it ensures the proper target permissions
Feb 07 19:06:46 <jow_laptop> its also more in line with what other packages are doing ($(CP) is usually done for copying entire trees)
Feb 07 19:06:58 <Zero_Chaos> jow_laptop: https://bpaste.net/show/ddf9145017cb updated
Feb 07 19:07:56 <jow_laptop> you sure its updated?
Feb 07 19:08:58 <Zero_Chaos> jow_laptop: had to run git add again, sorry https://bpaste.net/show/3c6c05fca2ed
Feb 07 19:11:02 <jow_laptop> that looks acceptable. Question, is there anything else besides bin/ and sbin/ in $(PKG_INSTALL_DIR)/usr/ ?
Feb 07 19:11:11 <Zero_Chaos> jow_laptop: significantly yes
Feb 07 19:11:41 <Zero_Chaos> jow_laptop: a bunch of support files and some man pages which aren't needed but the build system doesn't have a way to turn off
Feb 07 19:11:42 <jow_laptop> I see ok - was just thinking whether the install section could be further reduced but then its fine
Feb 07 19:12:21 <Zero_Chaos> jow_laptop: so assuming I SOB it right, I'm good to go then?
Feb 07 19:12:48 <jow_laptop> yes, if you run "git commit -s" it should be SoB
Feb 07 19:13:01 <jow_laptop> if you already committed but forgot, run "git commit --amend -s"
Feb 07 19:13:03 <Zero_Chaos> jow_laptop: heh, I wonder what name it will SoB with :-)
Feb 07 19:13:50 <Zero_Chaos> neat, it's mostly right
Feb 07 19:16:30 <Zero_Chaos> jow_laptop: okay, I think I've done this right.  Better? https://github.com/openwrt/packages/pull/872
Feb 07 19:17:16 <jow_laptop> yep
Feb 07 19:17:27 <jow_laptop> and as I said, if they demand further changes
Feb 07 19:17:49 <jow_laptop> do them as wanted and git commit --amend; git push --force
Feb 07 19:18:00 <jow_laptop> this will update the existing pr
Feb 07 19:18:19 <jow_laptop> so no need to setup yet another branch etc.
Feb 07 19:18:22 <Zero_Chaos> jow_laptop: awesome, I've been taught to avoid --force in all things, that will make things a lot easier
Feb 07 19:18:37 <Zero_Chaos> jow_laptop: thanks for the help.  I don't mind the back and forth and learning, but git is hard for me.
Feb 07 19:19:42 <karlp> Zero_Chaos: it's a good general rule, but --force on pull request branches is useful to replace the existing pull with a new one, without having to close and remake new ones, it's great for that use.
Feb 07 19:19:55 <Zero_Chaos> karlp: yes, that seems very good
Feb 07 19:23:17 <Zero_Chaos> jow_laptop: policy is to remove things from oldpackages when they are added to the packages repo, right?
Feb 07 19:25:25 <jow_laptop> yes
Feb 07 19:40:21 <plntyk> eh what about "+PKG_BUILD_PARALLEL:=1" - shouldn't this be removed ?
Feb 07 19:45:35 <builder> build #862 of ramips is complete: Failure [failed compile_4]  Build details are at http://buildbot.openwrt.org:8010/builders/ramips/builds/862
Feb 07 20:01:28 <OpenWrt-Commits> luka r44304 trunk/target/ (16 files in 10 dirs) * targets: files in uci-defaults do not need to be executables
Feb 07 20:01:34 <OpenWrt-Commits> luka r44305 trunk/target/ (10 files in 10 dirs) * targets: base-files: diag.sh does not need to be executable
Feb 07 20:01:38 <OpenWrt-Commits> luka r44306 trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-qihoo-c301.c * ar71xx: qihoo: define flash variable as static
Feb 07 20:01:41 <OpenWrt-Commits> luka r44307 trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network * ar71xx: uci-defaults: add el-mini to appropriate group
Feb 07 20:01:44 <OpenWrt-Commits> luka r44308 trunk/package/boot/uboot-envtools/files/ar71xx * package: uboot-envtools: add nbg6716 to appropriate group
Feb 07 20:06:24 <builder> build #212 of x86.kvm_guest is complete: Failure [failed compile_4]  Build details are at http://buildbot.openwrt.org:8010/builders/x86.kvm_guest/builds/212
Feb 07 20:40:07 <builder> build #835 of x86 is complete: Failure [failed compile_4]  Build details are at http://buildbot.openwrt.org:8010/builders/x86/builds/835
Feb 07 20:55:52 <OpenWrt-Commits> luka r44309 trunk/target/ (42 files) * ar71xx: merge board specific patches into one
Feb 07 21:04:04 <OpenWrt-Commits> jow r44310 trunk/package/ network/services/openvpn/files/openvpn.init network/services/openvpn/Makefile * openvpn: autostart openvpn instances for each .conf file in /etc/openvpn
Feb 07 21:04:14 <OpenWrt-Commits> jow r44311 trunk/target/toolchain/Makefile * toolchain: respect CONFIG_VERSION_FILENAMES and add host system suffix
Feb 07 21:04:19 <OpenWrt-Commits> jow r44312 trunk/target/sdk/Makefile * sdk: rename file to mention target/subtarget and move host system to suffix
Feb 07 21:04:24 <OpenWrt-Commits> jow r44313 trunk/target/imagebuilder/Makefile * imagebuilder: align filename with SDK
Feb 07 21:13:32 <OpenWrt-Commits> luka r44314 trunk/target/ linux/ar71xx/patches-3.14/725-MIPS-ath79-add_mikrotik_rb2011uias-2hnd.patch linux/ar71xx/patches-3.14/716-MIPS-ath79-add_mikrotik_rb2011uias.patch linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c * ar71xx: rb2011: apply patch to file
Feb 07 21:13:42 <OpenWrt-Commits> luka r44315 trunk/target/ linux/ar71xx/patches-3.14/722-MIPS-ath79-add-airGateway-support.patch linux/ar71xx/patches-3.14/608-MIPS-ath79-ubnt-xm-add-more-boards.patch linux/ar71xx/patches-3.14/616-MIPS-ath79-ubnt-xw.patch * ar71xx: ubnt: move new board patches into one
Feb 07 21:28:56 <OpenWrt-Commits> jow r44316 trunk/target/linux/x86/config-3.14 * x86: declare missing kernel symbols
Feb 07 21:40:15 <builder> build #771 of ar71xx is complete: Success [build successful]  Build details are at http://buildbot.openwrt.org:8010/builders/ar71xx/builds/771
Feb 07 21:42:10 <builder> build #202 of lantiq.xrx200 is complete: Success [build successful]  Build details are at http://buildbot.openwrt.org:8010/builders/lantiq.xrx200/builds/202
Feb 07 22:02:48 <OpenWrt-Commits> jow r44317 packages/net/aircrack-ng * aircrack-ng: moved to github
**** BEGIN LOGGING AT Sat Feb 07 22:47:38 2015
Feb 07 22:53:40 <builder> build #213 of brcm47xx.mips74k is complete: Success [build successful]  Build details are at http://buildbot.openwrt.org:8010/builders/brcm47xx.mips74k/builds/213
Feb 08 01:36:35 <Zero_Chaos> jow_laptop: thanks for all your help earlier, PR was accepted.  I'll use what I learned to fix up my other PRs
Feb 08 01:40:56 <DonkeyHotei> my pr is still waiting
Feb 08 01:41:41 <DonkeyHotei> https://github.com/openwrt/packages/pull/863
Feb 08 01:48:33 <builder> build #805 of avr32 is complete: Failure [failed compile_5]  Build details are at http://buildbot.openwrt.org:8010/builders/avr32/builds/805
Feb 08 02:32:07 <builder> build #744 of au1000 is complete: Success [build successful]  Build details are at http://buildbot.openwrt.org:8010/builders/au1000/builds/744
**** ENDING LOGGING AT Sun Feb 08 02:59:58 2015