<hurricos>
mrnuke: what's the difference b/w rebase and merge-commit in your case?
<hurricos>
mrnuke: pong
<hurricos>
do you need rewind perms and not have them?
<mrnuke>
hurricos: merge-commit messes up the history. you have the actual commits, and then a bunch of merge commits. I much prefer the other option
<hurricos>
Oh, you want me to rebase it all? :P
<hurricos>
I generally like rebase over merge, I just need to figure out what you're looking for me to chnage in the Github repository configuration side
<hurricos>
if anything
<mrnuke>
If you go to any PR, The ""Merge Pull Request" button defaults to "Create a merge commit". I would disable that option, and have it default to "Rebase and merge", or fast-forward merge
<hurricos>
Ahhhhhhhh
<mrnuke>
hurricos: Under Settings, there should be a few checkboxes: "Allow merge commits ", and "Allow squash merging ". I recommend unchecking them
srslypascal has quit [Ping timeout: 480 seconds]
mzvd has joined #openwrt-devel
srslypascal has joined #openwrt-devel
srslypascal is now known as Guest2508
srslypascal has joined #openwrt-devel
Guest2508 has quit [Ping timeout: 480 seconds]
jlsalvador has joined #openwrt-devel
<mrnuke>
hurricos: speaking of merges, I was thinking you should be the final arbiter wrt to merges. I haven't merged anything yet because I wanted to double-check this with you
Strykar has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
danitool_ has quit [Ping timeout: 480 seconds]
goliath has quit [Quit: SIGSEGV]
ptudor_ is now known as ptudor
Luke-Jr has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
philipp64 has quit [Ping timeout: 480 seconds]
philipp64 has joined #openwrt-devel
philipp64 has quit []
philipp64 has joined #openwrt-devel
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Ping timeout: 480 seconds]
Tapper has joined #openwrt-devel
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Remote host closed the connection]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
goliath has joined #openwrt-devel
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
mzvd has joined #openwrt-devel
mzvd has quit [Read error: Connection reset by peer]
minimal has joined #openwrt-devel
guidosarducci has quit [Remote host closed the connection]
guidosarducci has joined #openwrt-devel
mzvd has joined #openwrt-devel
jlsalvador has quit [Quit: jlsalvador]
jlsalvador has joined #openwrt-devel
jlsalvador has quit []
Borromini has joined #openwrt-devel
<hurricos>
mrnuke: I'm OK being the final arbiter, but as any maintainer I will be consulting professional advice ;)
<hurricos>
mrnuke: My personal workflow revolves around emacs' magit
<hurricos>
My work involves a substantial amount of git, in particular the use of separate branches to implement features for an ETL backend/frontend
<mrnuke>
hurricos: I do openrwt stuff for fun. I'm not a professional :-)
<hurricos>
thank you and others for pointing out the merge-commit-free workflow, I just discovered git merge --ff-only
<hurricos>
Lol I just mean if I see something weird I'm gonna ping people
<mrnuke>
(JK. I play a lot with yocto and custom build scripts -- this buildroot stuff is a nice retreat from that madness)
<hurricos>
It's been three years since I started at my current job and dragged the process kicking and screaming into git
<hurricos>
I've always dreamt of a day where I would never again have to create another f*ing merge
<hurricos>
for something I committed to a site-specific branch, git rebase'd onto the main branch and merged it down through all the f'ing feature branches
* mrnuke
alias git=fucking && fucking merge
<hurricos>
lmao
<hurricos>
I'm sitting on nearly 10k commits and a third of them are god damn merges
<hurricos>
Hold on, I haven't actually checked
<hurricos>
Jesus christ it's 43%
* hurricos
buries face in hands
<mrnuke>
hurricos: you're still fine as long as it's less than 50%
<hurricos>
mrnuke: I feel you. Buildroot (nicely) forces you to argue with other users about how to generalize things
<hurricos>
rather than just slicking layers and layers and layers and layers and layers
* hurricos
is unaware of the leech on the back of his neck that is sucking out my desire to understand git submodules
<hurricos>
mrnuke: defaults fixed. I didn't see a default for making the PR button force a rebase, but I suspect that removing the options to allow merge commits and squash merging might have done it?
<mrnuke>
hurricos: Yup. defaults to "Rebase and merge", and the other options are grayed out!
<mrnuke>
speaking of submodules, once you discover the svn equivalent, you will love submodules
<mrnuke>
you will love git submodules, that is
jlsalvador has joined #openwrt-devel
<hurricos>
I am glad I do not have to interact with svn
* mrnuke
has to use SVN at work
<hurricos>
No doubt, I have to say, I love that Yocto is so comfortable for keeping cruft working over the years
<hurricos>
it's just that, you know, I've seen both development styles and how they manifest
<hurricos>
and I just Don't Like Watching Cruft
<hurricos>
I'm lucky not to have to develop anything that has specific, obscure hardware integration dependencies
<hurricos>
you can't afford to avoid cruft when you depend on the binaries built by another vendor that no longer exists
* mrnuke
hands hurricos a crapsberry-pi
* hurricos
throws it in the bin
<mrnuke>
hahaahaha!
<mrnuke>
nice one!
<hurricos>
if I wanted an SBC I'd buy a Chromebook motherboard
<mrnuke>
x86 chromebooks have the same issue. I worked on both amd and intel versions of their firmware
<hurricos>
In terms of compilation? Yes
<hurricos>
Thankfully there's a community for it :^)
<hurricos>
and thankfully the security model is largely "write flash = pwn board"
<hurricos>
though I haven't dug far into what CR50 has brought; my understanding is that that's unchanged except for WSONs replacing SOIC8s
<mrnuke>
Well engineers who work on chromebook firmware are not the intern who asked for the lowest salary type
<mrnuke>
but there's only so much they can do given how vendors (looking at you amd and intel) just want to push their binary flatulence
<hurricos>
no, it's true. The brass tacks are redistributability though
<hurricos>
if it's just for early GOP setup ... but I haven't seen The Ugly, I guess
<mrnuke>
The run coreboot, which is nowadays just a glue to hold all the binaries together
<mrnuke>
I used to be one of the core devs for coreboot. I lost my sanity seeing all the blobs come in. Nowadays, I have no connection to the project
<hurricos>
Oh!
<hurricos>
I'm typing this from an Auron Paine, with the mrchromebox fw replacement
<hurricos>
I imagine bdw is too early for the horrors to have leaked in :D
<mrnuke>
Aything Core2duo or later and Bulldozer or later is horrifying
<mrnuke>
I think I had an AMD laptop running on coreboot once. This was Fam15, before dozer/ryzen. Everything, including the ACPI was written in source. Had almost no blobs. I think you needed a shim for the fancrontroller (SMU), and PCU microcode
<hurricos>
did you ever hear about anyone getting anywhere with ich8?
<hurricos>
I say that knowing the answer and suspecting the reason (no datasheet availability)
c0sm1cSlug has joined #openwrt-devel
<mrnuke>
ICH8 is old as. I thought coreboot had native code for ICH8 back in the day
<Slimey>
what about ich8
<hurricos>
No, sadly. C.f. Thinkpad X61 having no Coreboot port
<Slimey>
oh that
<hurricos>
I'm also mistaking ich8 for the whole platform (965 northbridge)
<hurricos>
slimey: no idea what's going on with the three pieces of storage on board. SPI-NOR, MXIC NAND and eMMC?
<Slimey>
i should be getting these in july
<mrnuke>
hurricos: chipset being supported and entire machine being supported are two different things. It's not like openwrt, where if the drivers exist, all you need is a devicetree
<Slimey>
Product: 4x4 AX Dual-band AP
<Slimey>
Type Identification: BSAP 6040
<hurricos>
mrnuke: Right, you get given no interface :P
<hurricos>
it's only similar insofar as that without chipset support you cannot hope to port the device
<Slimey>
hurricos the 3040 is like that SPI-NOR with eMMC
<hurricos>
slimey: I know, I saw. Just not sure why 3.
<Slimey>
no clue ill find out when i break into it :D